testing about edit to merge in
Merge branch 'master' of https://github.com/christopherhaly/chrisn

Conflicts:
	3.txt