Commiting Jaffa.java and MainActivity.java