fused added
manifest fucked up
fading feature completed //left to store each 'hit' within an
array/other DS
Merge branch 'maptesting'

Conflicts:
	redcolor/src/com/alert/redcolor/MainActivity.java
conflicts done