Project 7 start
Merge branch 'master' of https://github.com/viveret/BiscuitsAndGravy

Conflicts:
	Proj_6
	Project_4.cpp
	Project_6.cpp
	a.txt