changing header font size
fixing username link
Merge branch 'develop' into testing

Conflicts:
	app/assets/stylesheets/main.css.scss
	app/controllers/home_controller.rb
	app/controllers/recipients_controller.rb
	app/views/layouts/_mainnav.erb
	lib/notifier.rb
Creating new factories.
Merge branch 'develop' into testing
Commenting out factory_specs rake task because it's messing up rspec.
removed old tests.
Merge branch 'testing' of https://github.com/codeforamerica/promptly into testing
added group tests
Merge branch 'testing' into andyTesting