Fix coding standards.
Merge branch 'master' of github.com:Somsubhra/pycon.gj

Conflicts:
	main.py