Merge branch 'master' of github.com:udnaan/feastastic
Merge branch 'master' of github.com:udnaan/feastastic

Conflicts:
	server/config.js