Fixed Styleshhet Error
Merge pull request #58 from Ajhandler/config

Nav bar
Merge pull request #60 from Ajhandler/friendly

Fixed Styleshhet Error
Merge pull request #62 from Ajhandler/config

Fix nav bar
homepage styles done/nav/im the best
Merge branch 'dev' into resturant

Conflicts:
	app/views/shared/_nav.html.erb
Merge pull request #64 from Ajhandler/resturant

homepage styles done/nav/im the best
Merge branch 'dev' into config

Conflicts:
	app/assets/stylesheets/main.scss
	app/views/home/index.html.erb
	app/views/shared/_nav.html.erb