Corrected "Headquarters"
Merge branch 'jedbranch'
Merge branch 'master' of https://github.com/johnpenn/spacecloudexample