merge!
add request to package.json
change path for server.js to ../app
Merge branch 'addisonBranch' into reallygit
Merge pull request #5 from XYZMedia/reallygit

Reallygit