Merge branch 'master' of https://github.com/World93/ClassAssignment

Conflicts:
	project1.c

A merge.
Merge branch 'master' of https://github.com/World93/ClassAssignment

Conflicts:
	project1.c