Merge branch 'master' of C:\wamp\www\PHP\ProjectX with conflicts.
Formvalidation functions.
Merge remote-tracking branch 'origin/master'
Form validation functions.