Firing, explotion animation
Merge branch 'master' of https://github.com/phaikawl/projectx1

Conflicts:
	main.cpp
	player.cpp
	player.h