Merge branch 'master' of /home/peter/Projects/Java/AcidSpaceFighting with conflicts.
Merge branch 'master' of /home/peter/Projects/Java/AcidSpaceFighting with conflicts.