Debugging
Merge branch 'master' of github.com:dinfuehr/aic_group5_topic3