Fixing and Updating Repo
Fixing Repo
fix
Merge branch 'master' of https://github.com/swlivesay/IT320

Conflicts:
	.gitignore