added contact model and created associated controllers
fixed merge conflicts
added some validation to contact model
fixed merge conflicts
Merge pull request #54 from calblueprint/contact

Contact