init
remove node_modules folder from repo
ignore node_modules with .gitignore
update package.json
Merge pull request #7 from samccone/sjs/fix-example-app

Sjs/fix example app
Updated web.js
Added index.html
lol
fs fix
hw3 p2
lol
Merge heroku.com:morning-garden-1517 into dev

Conflicts:
	index.html
addbut
add