Updated log + readme
Merge branch 'master' of https://github.com/UofM-CS3350-Grp1/Project

Conflicts:
	log.txt
Fixed log.txt