small corrections
more implementations
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/java/pt/itgroup/hearthstoneproject/MainActivity.java