working on level 2
fix merge conflict
add rest of level 2 map
Merge branch 'master' into joy
updates level 2 map
merge with master
leaving school
fix lvl 2 spawn location
Merge branch 'master' into joy
Merge branch 'master' into joy
Merge pull request #3 from ABarnhard/joy

Joy