refactoring midway
refactoring a plittle more
comment
Merge branch 'master' of https://github.com/bjartwolf/SP2013Node

Conflicts:
	server.js