ssh aloha
Merge branch 'master' of github.com:FlandreDaisuki/sitcon-workshop-140811

Conflicts:
	README.md