add image, css, fix base.html
Merge branch 'aq'