Merge pull request #3 from estensland/test_branc

testing travis
Merge branch 'master' of https://github.com/estensland/The_Waxing_Crescent into test_branc