Merge pull request #2 from longpham91/master

merge
Merge pull request #9 from longpham91/master

merge for Albert
Merge pull request #12 from longpham91/master

update db
Merge pull request #14 from longpham91/master

merge
Merge pull request #18 from longpham91/master

update
Test push
Merge remote-tracking branch 'upstream/Albert' into Albert
Merge pull request #22 from DustyLenz/Albert

Test push
Merge pull request #25 from longpham91/Albert

Albert