installed carrierwave gem and added edit profile link to header
added avatar uploader to form
avatar successfully saved to local machine
Finished testing carrierwave and avatar
Saved unsaved file
added default image for avatar
refactored image test
updated gitignore
Merge branch 'master' of github.com:LaunchAcademy/neighborhoods into carrierwave

Conflicts:
	app/views/layouts/application.html.erb
started fixing line errors
Merge branch 'carrierwave' of github.com:LaunchAcademy/neighborhoods into carrierwave

Conflicts:
	app/uploaders/avatar_uploader.rb
	app/views/layouts/application.html.erb
	spec/features/avatar_functionality_spec.rb
Nav bar links
updated gitignore
forgery, forget it
Merge pull request #24 from LaunchAcademy/carrierwave

Carrierwave