jaja
better work!
Added an example function to the main activity
Merge branch 'master' of https://github.com/Magical-Pork-Chop/Android-Test
blah