Pre pull to Treehouse; 2014-12-04
- working on simpletimer to power the text stream
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Reader/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Reader/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Reader/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/7.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Reader/bin/Reader.apk
	Reader/bin/classes.dex
	Reader/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	Reader/bin/resources.ap_
Fix up clean up I hope.