-n 
4
Merge pull request #8 from dylanreid/feature4

-n
Merge commit '4eba5489d69c9c0ba7f5f044cd168428fb23989f'

Conflicts:
	core/core-version.txt