for merge purposes
for merge conflict purposes

Merge branch 'master' of https://github.com/aliceqhuang/processing_games

Conflicts:
	adventure_time_game/adventure_time_game.pde
changed the background of the game

Merge branch 'master' of https://github.com/aliceqhuang/processing_games

Conflicts:
	adventure_time_game/adventure_time_game.pde