Doc Started
Start
Merge branch 'master' of https://github.com/offtap/happiness-index

Conflicts:
	index.html