Commit to get latest

Getting latest.
Merge branch '2D_branch' of https://github.com/JordanStone/CS345BeatEmUp into 2D_branch