Merge branch 'master' of https://github.com/phaikawl/projectx1

Conflicts:
	bullet.cpp
	global.h
	main.cpp
	player.cpp
	player.h