testing pull

so I only added the one comment in CatchPhraseActivity.java but it added all the extra files I have in the repo. We might have to edit the .gitIgnore properties so it doesn't upload the class files. Other than that it's working fine.