Merge branch 'teamA' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
Physics / Collisions implemented
Physics / Collisions implemented
Physics should be compliant with approved architecture
Added a missing header for PlayerShip.java
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into develop
merge 1 of 2 complete
.
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA

Conflicts:
	.gitignore