Merge pull request #2 from CodeGreer/master

test
Totally confused commit

A commit from within Github for windows
Merge pull request #6 from magicbeet/master

Test while at your house