Log files
Fixed conflicts
Parth changes to the system
Merge branch 'master' of github.com:gugagreen/comp6231_fall2014