pre-pull commit that tweaked GUI elements
Merge branch 'master' of https://github.com/bsanders/softeng
restructured GUI to use more xaml resources instead of setting things by hand, and other tweaks
fixed scary .csproj conflict