updated node version and express module
jade file update
index jade update
minor formatting update on index
1st half of merge conflicts
finish 2nd half of merge