Settings added
Merge branch 'master' of https://github.com/InXeL/CS2530Group.git