Bug fixes
Merge branch 'ananth' of https://github.com/ananthd88/CSCE-633-670-Project into atin

Conflicts:
	Main.py
Merging final changes