icon fix?
icon fix?
Merge branch 'master' of https://github.com/jamesalfei/Digital2014.git

Conflicts:
	Android app/bin/EyeRange.apk
	Android app/bin/classes.dex
	Android app/bin/resources.ap_
Merge branch 'master' of https://github.com/jamesalfei/Digital2014.git