Signed-off-by: DapperCat <cameron2bootsma@gmail.com>
Merge branch 'master' of https://github.com/youngcraiger/TheForRealDougAndCamCapstoneProject
Signed-off-by: DapperCat <cameron2bootsma@gmail.com>
Signed-off-by: DapperCat <cameron2bootsma@gmail.com>
Signed-off-by: DapperCat <cameron2bootsma@gmail.com>
Signed-off-by: DapperCat <cameron2bootsma@gmail.com>
Merge branch 'master' of https://github.com/youngcraiger/TheForRealDougAndCamCapstoneProject

Conflicts:
	CamAndDougCapstoneCode/src/backend_models/PicFile.java
	CamAndDougCapstoneCode/src/frontend_viewcontroller/MainViewDisplay.java
	CamAndDougCapstoneCode/src/frontend_viewcontroller/ModelsAndViewsController.java

Signed-off-by: DapperCat <cameron2bootsma@gmail.com>