Fixed small bugs
Merge branch 'master' of https://github.com/msondheimer/web_dev_final

Conflicts:
	CONpetence/Gemfile