Try again for a merge
Merge branch 'master' of https://github.com/chrisinaber/CSG01.git

Conflicts:
	CONFIG/Minutes/minute_list.txt