gub1fixingWIP
Bug on line #27

Fixed a bug on line #27 where there were more format() referances than
{} place holders.
Merge branch 'bug1fixing'

Conflicts:
	main.py

Also took liberties and fixing some code style errors.