collision interface drafted
Merge branch 'master' of https://github.com/Gizmo4Life/TAPP_Project2 into TeamA
Commit to non-master branch?
directories up
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'master' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'teamA' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA

Conflicts:
	.gitignore