It compiles, ship it III

It's a trilogy now.
I'm a dumbass

Forgot to make math stuff for an array, but I fixed it now
L33T SCR33N GR4PH1X
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
	main.exe
	main.o