init commit
basic structure
Merge branch 'master' of https://github.com/nitincic/git

Conflicts:
	main.py
Merge branch 'master' of https://github.com/nitincic/git

Conflicts:
	main.py