Merge branch 'master' of github.com:IdeasOnCanvas/Ashton