Setup Devise with custom field
Merge remote-tracking branch 'origin/landingpage' into sign-in_sign-up

Conflicts:
	config/routes.rb
Merge branch 'old-state' into sign-in_sign-up
Add proper layout with Devise sign-in pages.
Update Sign-up page
Add Factory Girl Rails gem to gemfile
Fix custom.css merge conflict
Merge branch 'landingpage' into sign-in_sign-up
Link sign up page to main layout
Merge branch 'landingpage' into sign-in_sign-up
Add precompiled assets for Heroku
Update config application.rb to precompile images
Update config production.rb
Fixed errors