ignoring database yml
Merged devise gem implementation and resolved conflicts.
application rb
update haml rails
Resolved the sign in with google issue