End of day 3/26/13
3/27/2013
3/27
initial integrated branch
3/29

yup
morning 3/31/13

wharrrgrbl
3/31/13 evening

finished edit/delete options
Alpha RC

omg
Evening 4/2/13

progress
UI viewflipper integration
end of day 4/14
including omitted files

probably
including still more omitted files

probably
Merge branch 'proj' of https://github.com/rpcarrig/memomap.git into proj

Conflicts:
	MemoMapActivity/bin/classes.dex
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/DataHandler.class
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/MemoMapActivity.class
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/MemoMapService.class
	MemoMapActivity/bin/resources.ap_