user sign in and sign up are now styled
made some changes to home view and then changed it back
made some small styling changes
pushing
Merge branch 'master' of github.com:emmagard/solgarden into devise_views

Conflicts:
	app/assets/stylesheets/application.css
removed some changes from a merge
Merge pull request #21 from emmagard/devise_views

Devise views
Merge branch 'master' of github.com:emmagard/solgarden into heroku

Conflicts:
	app/assets/stylesheets/application.css
Merge pull request #22 from emmagard/heroku

Heroku
Fixed merge conflict