Marvin 12.06.14
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/GUIManager.java
	src/GUI/HPbar.java
	src/GUI/Inventory.java
	src/TalonIV/Attacks/BasicAttack.java
	src/TalonIV/Attacks/Beam.java
	src/TalonIV/Charas/Arf.java
	src/TalonIV/Charas/Character.java
	src/TalonIV/Charas/Human.java
	src/TalonIV/Charas/Troll.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/GUIManager.java
	src/GUI/HPbar.java
	src/GUI/Inventory.java
	src/TalonIV/Attacks/BasicAttack.java
	src/TalonIV/Attacks/Beam.java
	src/TalonIV/Charas/Arf.java
	src/TalonIV/Charas/Character.java
	src/TalonIV/Charas/Human.java
	src/TalonIV/Charas/Troll.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/GUIManager.java
	src/GUI/HPbar.java
	src/GUI/Inventory.java
	src/TalonIV/Attacks/BasicAttack.java
	src/TalonIV/Attacks/Beam.java
	src/TalonIV/Charas/Arf.java
	src/TalonIV/Charas/Character.java
	src/TalonIV/Charas/Human.java
	src/TalonIV/Charas/Troll.java