Fixed the migrations
Merge branch 'master' of https://github.com/rit-sse/rapdev13

Conflicts:
	Gemfile
	Gemfile.lock