Merge pull request #3 from longpham91/master

merge
Merge pull request #8 from longpham91/Long

Long
Merge pull request #11 from longpham91/Long

update db
Merge pull request #15 from longpham91/Long

Long
Merge pull request #28 from longpham91/master

update
Merge pull request #30 from longpham91/Rudy

Rudy
update
Merge pull request #32 from longpham91/Long

Long
Merge pull request #35 from longpham91/master

merge for Luke