precompiling assets
Merge branch 'master' of https://github.com/akash/secretsanta

Conflicts:
	public/assets/application-7bf12e2493ef16ca5e17fc725b2998ac.js.gz
	public/assets/application-a1afbc72285eeb9aefdf304d57bb4fe0.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
precompiling assets