Merge pull request #1 from Jeffail/branch1

Thisll get merged no problems
Merge branch 'master' of github.com:Jeffail/Test into branch1