layout new
Merge branch 'master' of https://github.com/daobv/emekong.org

Conflicts:
	css/style.css