Cleaned upp App.java
Merged Conflicts