Cleaned up some files
Merge branch 'master' of github.com:jcanedy/Groupdy
merged main.js
Conflicts:
	parse/cloud/main.js