add carrierwave for images and other gems, gitignore change
work on css
Merge pull request #43 from fparker9676/master

formating
Merge branch 'cssifying'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/_nav_selector.html.erb
image uploads, views and edits are passing
fix jquery reload and fix bits and pieces
ignore .env file added to gitignore
Merge remote-tracking branch 'bozcotty/images'

Conflicts:
	Gemfile
	app/controllers/plants_controller.rb
	app/models/plant.rb
	config/environments/development.rb
	db/seeds.rb
Merge pull request #44 from sotoseattle/cssifying

fix jquery reload and fix bits and pieces
remove fixed positioning
remove fixed positioning
Merge pull request #45 from fparker9676/testing

Testing
crop header
Merge pull request #7 from fparker9676/testing

Testing