fixed
blah
Merge branch 'master' of github.com:jimnanney/thewebsite

Conflicts:
	Gemfile
	Gemfile.lock