Added 'edit profile' link to tests
Added confirmation template
Merge remote-tracking branch 'eliza/master'
Syncing my fork
added confirmation template after fork sync
Additional email styling
Added tagline and styling on email template
Final styling, responsiveness
Merge branch 'template_design'
merging template_design to master
Conflicts:
	app/mailers/user_mailer.rb
	app/views/layouts/mail_layout.html.haml
sync with Eliza's squmblr
Email confirmation working and styled
Styling tweak
Merge branch 'master' of github.com:JamesNix/squmblr into JamesNix-master

* 'master' of github.com:JamesNix/squmblr:
  Styling tweak
  Email confirmation working and styled
  sync with Eliza's squmblr
  Final styling, responsiveness
  Added tagline and styling on email template
  Additional email styling
  added confirmation template after fork sync
  Added confirmation template
  Added 'edit profile' link to tests
Merge branch 'JamesNix-master'

* JamesNix-master:
  Styling tweak
  Email confirmation working and styled
  sync with Eliza's squmblr
  Final styling, responsiveness
  Added tagline and styling on email template
  Additional email styling
  added confirmation template after fork sync
  Added confirmation template
  Added 'edit profile' link to tests