second commit
Merge pull request #1 from peternguyen117/dev

second commit