Rogue verse
Merge branch 'master' of github.com:archaephyrryx/yorpg
Warlocked
Warlock->Sorcerer
Merge branch 'master' of github.com:archaephyrryx/yorpg

Conflicts:
	Rogue.class
	Rogue.java
	Warlock.class
	Warlock.java