Olle Version
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	Tryangle/.gitignore
	Tryangle/lib/lwjgl.jar
	Tryangle/lib/lwjgl_util.jar
	Tryangle/native/windows/OpenAL32.dll
	Tryangle/native/windows/OpenAL64.dll
	Tryangle/native/windows/jinput-dx8.dll
	Tryangle/native/windows/jinput-dx8_64.dll
	Tryangle/native/windows/jinput-raw.dll
	Tryangle/native/windows/jinput-raw_64.dll
	Tryangle/native/windows/lwjgl.dll
	Tryangle/native/windows/lwjgl64.dll
	Tryangle/src/com/januskopf/tryangle/Tryangle.java
	Tryangle/src/com/januskopf/tryangle/entity/Triangle.java
New Sebi Branch (Cubes on every Tile, Cubes drawable (Mouse Click),
Vertex-Grid, Exact Triangle Selection (show Triangle with Y/Z), Shield
(A,S))
deleted project data
ArrayList"staticCubes", Cubes drawable on top of each other, redo
("R"-Key), erase ("E"-Key)
Random Cubecolor change [C], 1280x720


Signed-off-by: Felix <FeJa-92@myopera.com>
crap
Merge remote-tracking branch 'origin/Sebastian'

Conflicts:
	Tryangle/src/com/januskopf/tryangle/canvas/TriangleArray.java