Update 1
Update 2
1.0
Merge branch 'master' of https://github.com/babaissarkar/paladin

Conflicts:
	Battlefield.java
	CLabel.java
	CardListener.java
Merge branch 'master' of https://github.com/babaissarkar/paladin