updated gulp to run node server now
Merge branch 'python_branch' of https://github.com/hectron/divvy into python_branch

Conflicts:
	app/public/index.html