Time log update
Finalized branch split
Characters now properly interact with platforms.
Character select has been started.
Merge branch 'master' of github.com:cse20212ssb/SuperSmashBrothers
Minor changes to Platform/Character interaction
Changed the map and added more platforms.
Added a bit of a bounce to the jump.
For next time: Change platform constructor to just x, y, size
Merge branch 'entityTest' of github.com:cse20212ssb/SuperSmashBrothers into entityTest

Conflicts:
	Characters/Megaman.cpp
	Events/Events.cpp
	Platform.h
	SSB.cpp
Fixed bug after merge
Merge branch 'master' into entityTest
Final changes from entityTest
Merge branch 'master' and 'Lab-9'