setting up cloudcontrol
setting up cloudcontrol
setting up cloudcontrol
added email uploader thing
Merge branch 'master' of github.com:gitfelix/battlehack

Conflicts:
	Gemfile