Starting on intake ~intake
Merge branch 'IntakeLogic'

Conflicts:
	documentTest.txt