3
Merge branch 'james2'

done
Merge branch 'master' of https://github.com/rogi0318/GitCourse

Conflicts:
	this is Peter
Merge branch 'master' of https://github.com/rogi0318/GitCourse