initial commit
added necessary gems
got devise setup
working on user sign in
added user controller
homepage structure
homepage structure
Merge branch 'master' of https://github.com/cemmanuel1/DBCFinalProject

Conflicts:
	finalproject/app/assets/stylesheets/home.css.scss
	finalproject/app/models/user.rb
	finalproject/app/views/home/index.html.erb
	finalproject/app/views/layouts/application.html.erb
created navigation
fixed merge conflict
fixed application conflict
pushing before I pull again
fixing merge conflict
application errors
fixed application HTML

moved footer to body, put container wrapper in index.html
application
fixed merge conflict

Conflicts:
	finalproject/app/views/layouts/application.html.erb
committing before pulling to update
Merge branch 'master' into ryan
adjusted nav