john change

john change
Merge branch 'bittelc'
Merge branch 'dibaggioj'
Merge branch 'master' of https://github.com/Big-Bang-Game-Project/Big_Bang_Phaser

Conflicts:
	README.md
deleted shit

deleted things
Merge branch 'dibaggioj'

Conflicts:
	README.md
Merge branch 'master' into dibaggioj
deleted everything

deleted everything
Merge branch 'dibaggioj'
Merge branch 'bittelc'

Conflicts:
	README.md
Merge branch 'master' into bittelc