Changing voxel editor settings, page
Merge branch 'master' of /Users/emily/Documents/cs194/RubeWorks

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/home/index.html.erb
Merge branch 'master' of /Users/emily/Documents/cs194/RubeWorks
Merge branch 'master' of https://github.com/amyzou/RubeWorks