FRIDAY Afternoon 6 updates
Merge branch 'master' of github.com:oraac/ewu-pinball