adding date and time validations
pulling from master
fixing merge conflicts
updating validations
Merge pull request #56 from jereln/jerel-final-edits

Jerel final edits