initial commit
Merge branch 'master' of github.com:DevCampus/clans.io

Conflicts:
	.meteor/packages
	.meteor/release
	packages/.gitignore
	smart.json
	smart.lock