Fixes for android.
Merge branch 'master' of github.com:brycedorn/katamari-tokei

Conflicts:
	katatokei/katatokei.pde
Merge branch 'master' of github.com:brycedorn/katamari-tokei

Conflicts:
	katatokei/katatokei.pde