gitting along
Merge branch 'master' of https://github.com/scott223/Attendar

Conflicts:
	ParseCloud/cloud/main.js