swapped art, reworked some views, made programmers tick (kinda)
swapped some art, repositioned game objects
Merge remote-tracking branch 'origin/master'
gtuy