Working on getting cform done
Contact form working fine as whine
Merge branch 'contact-form' Conflict solved

Conflicts:
	index.html