Added name Jonathan Phippen
Merge branch 'master' of https://github.com/Iluvatar/UWROV-2014

Conflicts:
	Names.txt