Finishing app
Merge pull request #14 from quangn92/master

Finishing up the app