Merge https://github.com/sanggonlee/sanggon_homepage

Conflicts:
	mysite/mysite/urls.py
Merge branch 'master' of https://github.com/sanggonlee/sanggon_homepage