ignoring netbeans files
merging branch jphernandez
contact form ready on frech
repository fixed with latest changes of contact forms
contact english ready
Merge branch 'origin/master'