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

Conflicts:
	.DS_Store
again