removing node_modules from repo. Run 'npm install' for now on.
adding package for 'npm install' majik'
updating readme
Script is now directly executable as ./server.js, and can accept port number in argument
Merge branch 'master' of github.com:tlhunter/Cobalt-Calibur-3

Conflicts:
	README.md
Finished upgrading packages
fixing welcome message. removing shift turn message (no longer applies after joshs quick tap update)
Merge pull request #1 from tlhunter/master

up to date