Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice
Merge branch 'master' of https://github.com/eddiekimosabe/SmallBizHack into create_invoice
Removed turbolinks, fixed formatting.
Merge pull request #27 from georgexzeng/master

fixed seed + partial
Removed turbolinks, fixed formatting.
Merge pull request #28 from georgexzeng/master

added in signup/sign to nav bar and modified public welcome index
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
Stopped chart js from loading on every page to fix nav bar bug
fixed merge conflict
Merge pull request #29 from apesic/views

Views
moved faker for heroku
fixed typo in seed
Merge pull request #30 from apesic/master

Fixed errors in seed
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
Nav Bar Changes
Merge pull request #32 from eddiekimosabe/nav_bar

Nav Bar Changes
changed wording in welcome index page