Merge pull request #38 from jrunningen/master

Put an actual form on the page and store Dragoman rules separately
Merge pull request #39 from jrunningen/master

Fill out more fields!
Merge pull request #40 from jrunningen/master

Make the app sort-of work again
Sign in/sign up flow
Change sidebar, add roles to users
Check admin status
Rudimentary Salesforce controller
Link to home from sidebar image
Styles for landing page

Because I set this up using just html and css, there may be some other
global styles that might affect it.
Merge styling from Clare
Move landing styling into home.css.scss
Start of styling for Devise pages
Helper method to change page title
Merge pull request #41 from lankyfrenchman/user_sessions

Landing/Sidebar/Sign up/Sign in Changes
style changes
more style changes
Merge remote-tracking branch 'ouzy/master'

* ouzy/master:
  more style changes
  style changes
  Helper method to change page title
  Start of styling for Devise pages
  Move landing styling into home.css.scss
  Styles for landing page
  Link to home from sidebar image
  Rudimentary Salesforce controller
  Check admin status
  Change sidebar, add roles to users
  Sign in/sign up flow

Conflicts:
	Gemfile
	Gemfile.lock
Remove pg from Gemfile.lock

Bundler did this, I guess because we don't need pg anymore.