fixed bug where parentless companies were erroring
Merge pull request #44 from onweapps/master

fixed bug where parentless companies were erroring
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle. Resolving merge conflict part 2

Conflicts:
	app/controllers/application_controller.rb