Update

Update files
Merge branch 'master' of https://github.com/efuste/myrottenpotatoes

Conflicts:
	Gemfile