resolving merge conflicts
Merge branch 'master' of https://github.com/dustin520/text_later_app
Adding the flash error messages for login and signup