base of JJROrder
Merge branch 'develop' of https://github.com/PsychedelicSalamander/BNR-Project-1 into develop
Merge branch 'develop' of https://github.com/PsychedelicSalamander/BNR-Project-1 into develop

Conflicts:
	MakingOrders/MakingOrders/DataManager.m