commit
Merge branch 'master' of https://github.com/janicelaksana/IF3038-2013