Moved the gemfile again
Merge branch 'master' of github.com:kwoodard22/wdi_project_1

Conflicts:
	Gemfile
DAMN YOU HEROKU & GEMFILE!!!