working on level 2
fix merge conflict
level 1 img added
add rest of level 2 map
Merge branch 'master' into joy
saving for merge
Merge branch 'master' of https://github.com/ABarnhard/mario
Merging Sarah's Changes
saving for merge
merged start screen
updates level 2 map
merge with master
skeleton and pirate girl
Merge branch 'master' of https://github.com/ABarnhard/mario
added stuff
json level 1 fixed
merge conflict
leaving school
Merge branch 'master' of https://github.com/ABarnhard/mario
Merging changes
fixed shooting solution
fix lvl 2 spawn location