Scales map2.
Fixes map 3.
Cleans up merge conflicts on Map 2.
Merge branch 'master' of github.com:periodic/LD30