commit for merging.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Fixed various bugs and tweaked some styling.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor