first commit
Merge branch 'master' of https://github.com/adw8d/triumphant_wang
second commit