Merge branches 'master' and 'master' of github.com:myongmoyng/ki_moyng
합체!
dd
Merge branch 'master' of https://github.com/myongmyong/ki_myong

Conflicts:
	Donate/apps/__init__.pyc
	Donate/apps/controllers.py
	Donate/apps/controllers.pyc
	Donate/apps/models.py
	Donate/apps/models.pyc
	Donate/apps/settings.pyc
	Donate/apps/static/css/index.css
	Donate/apps/templates/complaint.html
	Donate/apps/templates/index.html
	Donate/migrations/env.pyc