John Geiger 6bb5b53bad Merge branch 'master' into john-graph ...

# Conflicts:
#	Gemfile

2016-05-12 16:02:38 +02:00

..

images

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

javascripts

Merge branch 'master' into john-graph

2016-05-12 16:02:38 +02:00

stylesheets

Merge branch 'master' into john-graph

2016-05-12 16:02:38 +02:00

.DS_Store

Bar chart

2016-03-28 18:25:06 +02:00