comittest
Merge branch 'master' of https://github.com/LimeStreem/MagicalFPS

Conflicts:
	wiki/test.txt