Added contact-form to main file
Merge remote-tracking branch 'origin/contact-form' into contact-form

Conflicts:
	book-your-vacation.php