Merge pull request #1 from elanfs/master

New Cool Stuff
Update README.md
added cors
Merge branch 'master' of https://github.com/workshop-guild/nodeapp
Merge branch 'master' of https://github.com/workshop-guild/nodeapp into workshop-guild-master

Conflicts:
	README.md
	server.js