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

waffle.io Badge
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