Fixed an issue with including uneccesary files.
Merge branch 'master' of https://github.com/j-rewerts/Team17Project