add waffle.io badge
Merge pull request #15 from waffle-iron/master

waffle.io Badge
Merge pull request #53 from Ajhandler/friendly

Friendly
add basic styles
Merge branch 'styt push origin devlethemes' into dev
Merge branch 'master' of github.com:Ajhandler/Local into dev
Merge branch 'dev' of github.com:Ajhandler/Local into dev

Conflicts:
	app/views/companies/show.html.erb
fix subdomain bug
Merge pull request #55 from Ajhandler/resturant

fix subdomain bug
Add nav
Fix merge errors
Push
Merge pull request #58 from Ajhandler/config

Nav bar
Merge pull request #60 from Ajhandler/friendly

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

Fix nav bar
homepage styles done/nav/im the best
Add style to all forms
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