change routing and redirects
Merge pull request #38 from Ajhandler/config

Config
Merge branch 'routing' into dev

Conflicts:
	app/models/user.rb
no commit
Merge pull request #41 from Ajhandler/config

pushing
Update company.rb
no push
fix company not saving bug
t push origin devMerge branch 'bugfixcompany' into dev
Merge branch 'dev' of github.com:Ajhandler/Local into dev

Conflicts:
	app/models/company.rb
added buisness info to show action
Merge pull request #43 from Ajhandler/Templating

Templating
Add best in place to edit company index