properly branched#131

brickstudymasons wants to merge 2 commits intodevelopbrickstudymasons/brickstudy:developfrom

properly_branchedbrickstudymasons/brickstudy:properly_branchedCopy head branch name to clipboard