test5
Merge branch 'master' of https://github.com/cishak/IAT455

Conflicts:
	newName.html