some commits that were present, these should be fine to commit
Merge branch 'develop' of https://github.com/markearthware/Risk into develop