wrote a bunch of tests
Merge branch 'master' of github.com:cavneb/edu-app-rails-4