Merge pull request #6 from briantruong777/Yay

asdfsadfasdfasdfasdf
Merge pull request #7 from briantruong777/master

asdfasdfasdfasdfasdfasdf