Brandmachine
Merge branch 'master' of https://github.com/danben4/INTOPrufa

Conflicts:
	NIM.cpp
Merge branch 'master' of https://github.com/danben4/INTOPrufa

Conflicts:
	NIM.cpp
Merge branch 'master' of https://github.com/danben4/INTOPrufa
Legend
Merge branch 'master' of https://github.com/danben4/INTOPrufa