implemented single table inheritance
eliminated silly "my" model
changed collection to imageset under my
forgot to remove my/collections view
added some very basic new study workflow
Merge branch 'auth'

Conflicts:
	Gemfile.lock
	app/models/my.rb
	app/views/layouts/_navigation.html.erb
	db/schema.rb
now it works
Merge branch 'master' of https://github.com/osu-eng/technicity into auth

Conflicts:
	app/models/my.rb
	db/schema.rb