Errors debugging
Collision working :)
Merge branch 'develop' of github.com:SalamiCo/IGrP2 into develop

Conflicts:
	Ball.cpp
Minor changes
Conflict fixed
Now the ball rebounds
The random number was wrong. Changed. Still getting errors
Errors with some moves fixed.
Range for collision changed to >0.005 instead of >0.1
Added 2 triangles to test.
Timer is working
Intersection with circles working
Conflicts solved