test
Merge branch 'master' of heroku.com:wwcoaching

Conflicts:
	node_modules/guid/package.json