Merge pull request #2 from seanperkins/create_endpoints

Create api controller for student groups and teachers
Add tests of models
Merge branch 'Add-tests'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into create_endpoints

Conflicts:
	Gemfile.lock
	app/models/block.rb