merge fail
merging
Merge branch 'master' of https://github.com/MichaelBissell/Stuff

Conflicts:
	.gitignore
	HW2/BLB/read_some_lines.py