android stuff
fleshing out the tools used for android project
Merge branch 'master' into android

Conflicts:
	yiqingsim.tex
adjusted vertical space
reorg
Merge branch 'master' into android

Conflicts:
	yiqingsim.tex
Merge branch 'master' into android

Conflicts:
	yiqingsim.tex
new item for android project
i did moar things
Merge branch 'master' into android

Conflicts:
	yiqingsim.tex
Merge branch 'android'

Conflicts:
	yiqingsim.tex