Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge pull request #45 from browles/master

typo