cat images
Merge branch 'footer'
Merge branch 'master' of github.com:cemmanuel1/chimehack
dev conflict
solr
solr