Revert "Reverted jihad commit"

This reverts commit 423e4a0f3524edefd950923c2ffb0f483bd837ce.
added company profiles
more on tests
updated master
Merge pull request #246 from ndomar/c3s5_answer_question

C3s5 answer question