removed some things that actaulyl made it slower
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp