ssh key add
Merge branch 'master' of https://github.com/hcs/helios

Conflicts:
	group.py
	helios.py