edited README.md
Edited web.js port from 5000 to 8080
fixed up web.js
Merge branch 'staging'

Conflicts:
	web.js
Merge branch 'staging'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/staging'

Conflicts:
	README.md
test
testing