init
Compile assets
use unicorn
missing files
add welcome screen
addmissing files again
Merge remote-tracking branch 'heroku/master'

Conflicts:
	.gitignore