Git ignore target
Merge pull request #366 from ping19/master

Distance text positioning
Merge remote-tracking branch 'upstream/master'
Fix time travelled on game over
Merge pull request #367 from dreamteam69/master

Fix time travelled on game over
Merge remote-tracking branch 'upstream/master'
change database username
Merge pull request #368 from katiewood/master

change database username
Change song for theme1
update theme1
Merge pull request #369 from katiewood/master

update theme1
Merge pull request #2 from The-Dream-Team/master

Update upstream
Update pom.xml

Update file name to match game version
Merge pull request #370 from dreamteam69/master

Update pom.xml
sound
Merge pull request #371 from katiewood/master

sound
edit ship 1
Merge pull request #372 from katiewood/master

edit ship 1
edit ship 3
Merge pull request #373 from katiewood/master

edit ship 3