Changes to Footer. HTML and In Line Attachments in Email
Merge branch 'master' of https://github.com/mantiscy/Project2

Conflicts:
	cabinet_app/config/initializers/devise.rb
Merge branch 'master' of https://github.com/mantiscy/Project2

Conflicts:
	cabinet_app/app/views/layouts/application.html.erb
Email Notification after sharing network working
Merge branch 'master' of https://github.com/mantiscy/Project2