exercises
Merge branch 'master' of https://github.com/Arkanine/SelfTeacher

Conflicts:
	app/views/store/index.html.erb
	config/routes.rb
new