Update npm package info to better fit standard
Merge branch 'master' of github.com:itsananderson/web-server

Conflicts:
	package.json