hjk
Merge branch 'master' of https://github.com/jyundesign/dev

Conflicts:
	source/about.html.erb