Fixing package.json
Merge branch 'CookieServe' of https://github.com/UManitobaOcho/OchoServer into CookieServe

Conflicts:
	package.json