Added feature 25 changes
Added nl to eof
Merge branch 'feature/25' into dev

Conflicts:
	Source1/MyCode.cpp - resolved