new version
Merge branch 'master' of https://github.com/ERit/aic_group2_topic1