added a line and changed a second line
Merge branch 'master' of https://github.com/MattGarner/2014-11-10-NHS2

Conflicts:
	file.txt