jade and frontend, annoying
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from ericmwalsh/master

little jade changes