created server prototype
Merge branch 'master' of github.com:asabro/spajam-pre

Conflicts:
	server/app.js