updates
Merge branch 'scotts_ui' of github.com:scottmsims/blasphemus-frontend into scotts_ui