1) Fixed Panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	CNAME
Merge branch 'master' of https://github.com/meido/meido.github.io