bootstrap

bootstrap
Merge branch 'master' of https://github.com/Go-gwangbok/python

Conflicts:
	.DS_Store