Finished 3.1
Merge branch 'master' of github.com:mariusei/AST4310

Merging progfiles and report for 3.1