no changes
Merge branch 'master' of https://github.com/Jakub-Ciecierski/android

Conflicts:
	testGry/app/src/main/java/pl/dybisz/testgry/shapes/Triangle.java
Cube class has been added.
Merge branch 'master' of https://github.com/Jakub-Ciecierski/android

Conflicts:
	testGry/app/src/main/java/pl/dybisz/testgry/GameRenderer.java