Merge pull request #1 from IanJRigg/master

updating my repo
Merge pull request #3 from candaya/master

Merge pull request #1 from IanJRigg/master
Merge pull request #7 from IanJRigg/iantest

Iantest