Committing changes for merging with Jon's pull request
Minor additions to UI across the board
Merge pull request #25 from Hartman2/master

Week of October 27th merge
Merge pull request #8 from BlueText/master

Take in Andrew's pull request October week 4