add bootstrap gems, create welcome index
start bootstrap layout, add zip code iframe from arbor day site
Merge pull request #2 from bozcotty/bootstrap

add bootstrap gems, create welcome index
add admin signin test
add tests, plant object
build collapsible navbar, sticky footer, basic logo
add authentication via devise without registrations
get rid of .ds_store files
Merge pull request #3 from bozcotty/navbar

build collapsible navbar, sticky footer, basic logo
Merge branch 'master' into devise

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'devise'
Plant Object Working, all tests pass
add plant object
Merge pull request #5 from fparker9676/plant

Plant
add user login message, clean up page alignment, lighten admin link
Merge pull request #6 from bozcotty/des-c1

add user login message, clean up page alignment, lighten admin link
get hardiness region from zipcode by calling ext service
add faker gem, seed plants in seeds.db, start plant index partial view
Merge pull request #8 from bozcotty/seeds

add faker gem, seed plants in seeds.db, start plant index partial view
Merge branch 'zipcodes'

Conflicts:
	app/views/welcome/index.html.erb