Merge pull request #6 from Gerb11/master

Changed triangle to be flat rotation
Merge pull request #7 from Gerb11/master

Giving depth to the triangles to fix gravity problems.
updating origin
Cannon Velocity Now Modifiable
Merge pull request #8 from mkirk8/addCannon

Cannon Velocity Now Modifiable
Merge branch 'master' of github.com:TeamTriangular/Triangular

Conflicts:
	Assets/Blender Objects/Materials.meta
	Assets/Blender Objects/Materials/Material.mat
	Assets/Blender Objects/Materials/Material.mat.meta
	Assets/Blender Objects/Materials/No Name.mat
	Assets/Blender Objects/Materials/No Name.mat.meta
fixing unity exception for child collisions
Merge pull request #9 from wroy/master

Fixed Unity Exceptions
Repairing Hinges
Merge pull request #11 from mkirk8/addCannon

Repairing Hinges
updating
updating
updating
Updated triangles to use instead of squares, solving merge conflicts.