no message

Signed-off-by: NKanabolo <nornkable@yahoo.com>
Merge branch 'master' of https://github.com/NKanabolo/nk2497880

Signed-off-by: NKanabolo <nornkable@yahoo.com>

Conflicts:
	Projects/CSC5_Project2/build/Debug/Cygwin_4.x-Windows/main.o
	Projects/CSC5_Project2/dist/Debug/Cygwin_4.x-Windows/csc5_project2.exe
	Projects/CSC5_Project2/main.cpp
	Projects/CSC5_Project2/nbproject/private/private.xml