pretty pictures
merged. i fixed the formatting in the index.jade so that was a bitch for git to figure out