Revert "Finishing up the app"
Merge pull request #15 from herious89/revert-14-master

Revert "Finishing up the app"