committing changes from the App.java and after running mvn clean
committing all of the changes that were done to implement several features.
fixed conflicts