Messed with doxygen
Merge branch 'master' of https://github.com/Paludan/A412

Conflicts:
	main.c