Adding compressed file w/ the modules
Solving conflicts b4 merging with devel