Creation
Merge branch 'master' of https://github.com/henrdiazlds123/CIT260

Conflicts:
	.gitignore