Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice
Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice
Make minor adjustments to nav bar
Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice

Conflicts:
	app/views/shared/_nav.html.erb
	app/views/welcome/index.html.erb
	db/seeds.rb
Minor style change
Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice

Conflicts:
	db/seeds.rb
Merge pull request #31 from eddiekimosabe/nav_bar

Nav bar