ignoring database yml
Merged devise gem implementation and resolved conflicts.
application rb
update haml rails
Resolved the sign in with google issue
Merge branch 'implement_device_gem' of https://github.com/arvind-clarion/assets_management into arvind-clarion-implement_device_gem

Conflicts:
	Gemfile
Merge branch 'arvind-clarion-implement_device_gem' into implement_device_gem
added google auth link on login page