moaaar merging for the final release Merge branch 'master' of github.com:Lab41/magichour
moaaar merging for the final release
Merge branch 'master' of github.com:Lab41/magichour

d-grossman/magichour,d-grossman/magichour,d-grossman/magichour,d-grossman/magichour,d-grossman/magichour