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

Conflicts:
	package.json
Oops, messed up package.json
Finally accurate package, sorry!
Merge pull request #10 from UManitobaOcho/CookieServe

Cookie serve