Uh-oh. made changes
Save _nav
Saving, back home
Merge branch 'master' of github.com:drooJohnson/Tog

Merging assignmentsUI into master for ease-of-use
Merge remote-tracking branch 'origin/feat/assignmentsUI'

Conflicts:
	app/controllers/photographer_assignments_controller.rb
	test/controllers/photographer_assignments_controller_test.rb
Merge release to master
Fix gemspec
Fix gemfile git path
Fix gemfile git path
Fix gemfile git path
Fix gemfile git path
Fix merge conflict in application.css.scss
Merge branch 'release/0.0.2'
Add mailgun, betterer
Small fixes
Fix email
Merge branch 'master' into development