stuck files
Merge branch 'master' of https://github.com/AnthonyHunt/leihs

Conflicts:
	log/production.log
	public/assets/manifest-4dd88dd2d89fe0e05935a721e66581f5.json
	tmp/cache/assets/production/sprockets/60f1e97d7008b3ed41f72855a4228bb9
	tmp/cache/assets/production/sprockets/c2a831ed79df487d6485a5c9c52766c2