Parent companies now returned in Array
Merge pull request #40 from onweapps/master

Parent companies now returned in Array
fixed bug, parents only coming back if they exist
Edited view to accommodate new JSON response structure

* mainIndex.html divs have been tweaked to iterate correctly through the new structure
* application_controller.rb was changed to remove names from parent objects
Merge pull request #41 from onweapps/master

fixed bug, parents only coming back if they exist
Merge pull request #43 from keaty/master

Edited view to accommodate new JSON response structure
Merge remote-tracking branch 'upstream/master'. Resolved merge conflicts.

Conflicts:
	app/controllers/application_controller.rb