little bugs
Merge branch 'master' of https://github.com/phonpr/cs414-mps
a
Merge branch 'master' of https://github.com/phonpr/cs414-mps
a whole bunch of stuff
fixed desktop conflicts