initial commit
Merge branch 'master' of github.com:dompstar/teacherapp_web

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	config/initializers/inflections.rb
	config/routes.rb
	spec/spec_helper.rb