CHINIM CHINIM
Merge branch 'master' of https://github.com/Krankrestey/all_hobbies

Conflicts:
	header.html
	index.html