Project v1.2
Project v1.2
Project v1.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projects/Project 1/Project 1/build/Debug/Cygwin_4.x-Windows/main.o
	Projects/Project 1/Project 1/dist/Debug/Cygwin_4.x-Windows/project_1.exe
	Projects/Project 1/Project 1/main.cpp

Signed-off-by: zach5456 <zstewart3@student.rcc.edu>