Merge pull request #44 from browles/master

last minute
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge branch 'master' of https://github.com/GoldenLions/Artproject