initial commit
Merge branch 'master' of github.com:iNeedCode/CDT414

Conflicts:
	README.md