Just boilerplate node and express stuff
merging Jacob's stupid merge conflicts
merging conflicts
Merge pull request #1 from jasonalmaturner/master

Stuff