First commit after Android Studio Import

Signed-off-by: markfknight <mark@markfknight.com>