Merge pull request #3 from marathanman4202/master

make this branch the same as master
Merge pull request #4 from marathanman4202/test_branch1

Merge pull request #3 from marathanman4202/master