Fixed conflict.
Merge branch 'master' of github.com:black-duck/SpaceDefense