Git ignore target
Merge remote-tracking branch 'upstream/master'
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