just fix commit
Merge branch 'master' of github.com:hevi9/hevi_proto

Conflicts:
	.settings/org.eclipse.core.resources.prefs
mkblog working, needs css tuning yet