added missing log file
Merge branch 'homework5' of github.com:stumped2/CS311 into homework5

Conflicts:
	homework5/log.txt
added merge failed log file