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

Conflicts:
	config/routes.rb
	public/assets/manifest-b0478ec6a4bc5fb5f8de97fe06289e4f.json