ruby 2 rails 4
test
index
gemfile
conf
.
for rails 4
js
Merge branch 'master' of github.com:su3/sensorium

Conflicts:
	.gitignore