Initial commit
Merge https://github.com/onionsinmypants/Android-Project