change 2
Merge remote-tracking branch 'origin/NicksBranch'

Conflicts:
	readme.txt