Finishing app
Merge pull request #14 from quangn92/master

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

Revert "Finishing up the app"