Merge remote-tracking branch 'origin/peepeetrix'

Conflicts:
	defendthebeast/src/Enemies/Boss.java
	defendthebeast/src/Turrets/Turret.java
	defendthebeast/src/Turrets/Turret1.java
	defendthebeast/src/Turrets/Turret2.java
	defendthebeast/src/Turrets/Turret3.java
	defendthebeast/src/Turrets/Turret4.java
	defendthebeast/src/Turrets/Turret5.java
Merge branch 'isack' of https://github.com/duilio1337/defendthebeast.git
into isack
Merge pull request #2 from duilio1337/isack

Isack