testing a different config (devisemailer)
added Procfile, added delayed_job gem for scheduling tasks
just commmitting to pull
corrected merge conflicts
added rake tasks for scheduler
Merge branch 'master' of https://github.com/kaplali/parkstorm
Merge branch 'master' of https://github.com/kaplali/parkstorm
testing email stuff
fixing merge conflicts
added methods to notification model
Merge branch 'master' into mailers
fixing forms
deleted some files, working on profile page. Need to get notifications fixed
profile mvp done
logout and login works
Merge pull request #25 from kaplali/landing-page

Landing page
adding email templates
fixing merge conflicts
fixed merge errors
deleted procfile