conflict resolve between laurie and local master
merge conflict resolved
merge conflict resolved
mailer added into if statement
Merge branch 'master' of github.com:angelali92/tech-match
Added Test CRUD and successfully linked to other models
preparing for heroku
Css new account page and user profile background and navbar
Fixed Test Login
CSS user page
merger with sarah