my update
Merge branch 'master' of github.com:joshuanl/git-lab

Conflicts:
	test.cpp