Merging work directory to root
Merge branch 'master' of https://github.com/ytham/camelpillar

Conflicts:
	index.html