foo bar
Merge branch 'master' of https://github.com/arkiver/snacks

Conflicts:
	app/views/snacks/show.html.erb
Merge branch 'master' of heroku.com:nashta