Got the mailer to work
Fixing merge conflicts
Fixing merge conflicts
Merge branch 'master' of https://github.com/trishaanand/IFTTT_Prototype

* 'master' of https://github.com/trishaanand/IFTTT_Prototype:
  Mails are going through now
Improving the notification email with airmail
Fixing merge conflicts
Fixing merge conflicts
Adding gem for PG & Devise

# By Trisha
# Via Trisha
* 'master' of https://github.com/trishaanand/IFTTT_Prototype:
  db read works. Insertion not done

Conflicts:
	app/mailers/user_mailer.rb
	config/environment.rb
Adding Gemfile.lock as required by heroku
Removing sqlite from Gemfile
for deplyoment on heroku
for deplyoment on heroku-gemfile.lock
compile error fix