Merge pull request #1 from zachjyoung/second

All is working, merging with master
Merge pull request #2 from zachjyoung/master

Merge pull request #1 from zachjyoung/second