Merge branch 'master' of https://github.com/uzerzero/Strollers-1

Conflicts:
	src/Model/Triangle.java