trial1

few more files updates

Squash of previous 2 commits for replacing math.h with shogun include.