user sign in and sign up are now styled
made some changes to home view and then changed it back
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