employees controller modified, update method
modified topics controller and new view
modified company homepage view
changed show employee view for 'public' attribute
changed edit employee view for 'public' attribute
edited edit challenge for 'public' view
updated challenges controller and new/show views
fix merge conflict
modified employees edit/new views
modified/rearranged companies show view
modified/rearranged employees show view
modified/rearranged topics new view
Merge pull request #28 from andmcgregor/controller_edit

employees controller modified, update method