removing some files
removing more files
Optimized the app by reducing the number of buttons in the layout.(Instead of hiding and showing four buttons I change the background and text of two.)
Preparing the branch for merging with master