Fixed the mirgrations so that you can run them now. After pulling this commit be sure to run rake db:migrate
Changed the default route to the index page in pages
Merge branch 'master' of https://github.com/kpatt1011/project3

Conflicts:
	Gemfile.lock