pushing up example code
Revert "pushing up example code"

This reverts commit 1676b0b9d0ca995f766981f422565ece86d70e52.
A proper commit this time.
collision interface drafted
Merge branch 'master' of https://github.com/Gizmo4Life/TAPP_Project2 into TeamA
pushing up more dev stuff
Revert "pushing up more dev stuff"

This reverts commit d4d1a6b5a06fa4e3d37e16f394ed6dec08e334ec.
proper commit
removing reference
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 develop
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
updating with latest architecture, no guarantee that it will either run or compile
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
merge 1 of 2 complete
Merge branch 'teamA' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA

Conflicts:
	.gitignore