Heroku conf
Merged css files
Cache to 1h
Cacheing
merge conflict
css fix