git is asking me to do this
Merge branch 'master' of http://github.com/hephistocles/Aperio
just in case
Merge branch 'master' of http://github.com/hephistocles/Aperio
images added
updates to views