Merging changes from other machine not using Git
Aesthetic changes in preparation for demo, no work on bugs