recommit
xml welcome
Merge branch 'master' of https://github.com/erikahairston/All-In-Tasks

Conflicts:
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/erikahairston/All-In-Tasks

Conflicts:
	bin/classes.dex
	bin/resources.ap_