낄낄
씨발롬들아
Merge branch 'master' of github.com:myongmoyng/ki_moyng

Conflicts:
	Donate/apps/controllers.py
	Donate/apps/templates/index.html