Merge branch 'release/1.0' into develop
moved dinner.txt into my directory
Merge branch 'develop' of github.com:scottdavis99/lsi into develop
initial commit of pim project
updated the homePage
updated gitignore
added login form
Merge branch 'develop' of https://github.com/scottdavis99/lsi into develop
TRAIN-28 Implemented CRUD for Events
added form auth
added note domain
Added CRUD for contacts
TRAIN-28 changed from a hasMany to a basic String
Merge branch 'develop' of github.com:scottdavis99/lsi into develop
added a scaffolded note controller
Merge branch 'develop' into feature/train_42_crud_user
updated lunch.txt to test SSH key
Merge branch 'feature/train_42_crud_user' into develop
starting code for email
Merge branch 'develop' of github.com:scottdavis99/lsi into develop