starting olap module while reformatting other files
yes merge!

Merge branch 'master' of https://github.com/UliceNix/RISGroup4