html changes
form validation--still in progress
Merge branch 'master' into brendle_branch