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