Minor change.
Merge branch 'master' of https://github.com/ryanatallah/learnspice

Conflicts:
	app/routes/socket.js