촤하
Merge branch 'master' of github.com:myongmoyng/ki_moyng

Conflicts:
	Donate/apps/controllers.py
	Donate/apps/templates/index.html
Merge branch 'master' of github.com:myongmoyng/ki_moyng

Conflicts:
	Donate/apps/controllers.py
소스트리시발