Completed 2 Pieces
Merge branch 'master' of https://github.com/eternalearth888/csci445_team