changed cardsfragment
Remove the now ignored directory "bin"
Merge branch 'master' into psuedo_master
merge fix MainActivity
added new resources
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/MainActivity.java
merge fix MainActivity
Merge branch 'psuedo_master'