some small change to dockerfile and grassrc
Merge branch 'master' of https://github.com/mhumeSF/ISTA-420-Midterm
Merge branch 'stephen'