validations complete
Merge branch 'master' into validations
Merge pull request #19 from mikewong79/validations

Validations