Made the code much more pythonic
Forgot to add files
Merge branch 'master' of https://github.com/hiafi/cs497_project

Made the code much more pythonic

Conflicts:
	LogParser.py