foolin'
Merge branch 'master' of github.com:chrislerum/pigglecraft

Conflicts:
	app/views/layouts/application.html.slim