Refactor code
Merge branch 'master' of github.com:phamd1989/BasicTwitterApp