Server changes
Merge branch 'master' of https://github.com/bobby-brennan/lucybot-com

Conflicts:
	server.js