Merge pull request #8 from bekkibolthouse/master

trying to see if i'll get the pr message...
Merge pull request #9 from bekkibolthouse/pushing-pr-from-desktop

Merge pull request #8 from bekkibolthouse/master