resolving conflicts
Merge branch 'master' of https://github.com/Huii/cg1213rc