first commit
Merge branch 'master' of https://github.com/lesquoyb/burn

Conflicts:
	__pycache__/bullet.cpython-34.pyc
	__pycache__/cat.cpython-34.pyc
	__pycache__/character.cpython-34.pyc
	__pycache__/droppableObject.cpython-34.pyc
	__pycache__/gun.cpython-34.pyc
	__pycache__/healthBonus.cpython-34.pyc
	__pycache__/map.cpython-34.pyc
	__pycache__/player.cpython-34.pyc
	__pycache__/weapon.cpython-34.pyc
	bullet.py
	cat.py
	character.py
	droppableObject.py
	game.py
	gun.py
	healthBonus.py
	images/background.jpg
	map.py
	player.py
	weapon.py
Merge branch 'master' of https://github.com/lesquoyb/burn

Conflicts:
	bullet.py
	cat.py
	character.py
	game.py
	gun.py
	map.py
	player.py
	weapon.py