Still working on getting the bosses to work
Merge branch 'master' of https://github.com/Master109/GiliTouhouGame

Conflicts:
	TouhouGame_Playable/Achievements.pde
	TouhouGame_Playable/Boss1.pde
	TouhouGame_Playable/Bullet.pde
	TouhouGame_Playable/BulletWiggle.pde
	TouhouGame_Playable/Enemy.pde
	TouhouGame_Playable/EnemyMoveTowardsPlayer.pde
	TouhouGame_Playable/EnemyMoveTowardsPredicted.pde
	TouhouGame_Playable/EnemyShootHeadOn.pde
	TouhouGame_Playable/EnemyShootTowardsPredicted.pde
	TouhouGame_Playable/EnemyShootWigglyBulletSpread.pde
	TouhouGame_Playable/Initial Data.txt
	TouhouGame_Playable/Level1.pde
	TouhouGame_Playable/Player.pde
	TouhouGame_Playable/Save Data.txt
	TouhouGame_Playable/TouhouGame_Playable.pde
	TouhouGame_Playable/UI.pde