friday
changes to jade files
resolved conflicts
Merge pull request #14 from KodeIV/jadeEdits

Jade edits