finish part 2
Merge pull request #2 from ZackFullbuster/master

finish part 2