add files
Merge branch 'master' of github.com:cutehalo/cutehalo.github.com

Conflicts:
	_config.yml