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

Updating program files