Merge branch 'master' of https://github.com/danielrasmuson/Health_Communication

Conflicts:
	index.html
fix merge