Merge branch 'master' of https://github.com/shaalin/awsHackathon2014

Conflicts:
	pubKeys/grouped-keys.pub