test
Merge branch 'master' of https://github.com/CptShock/AuroraModules

Conflicts:
	nieuwsTest.py