Init
My first commit
Merge branch 'james' of https://github.com/jamwjam/android-test into james