Feature branch testing #12

Open

robertxsonny wants to merge 6 commits intoDionsaurus:masterfrom

robertxsonny:feature_branch

Commits on Nov 22, 2016

modify deathstar.json and add a new file
Dionsaurus
committed
new commit testing
Robertus Sonny Prakoso
committed
merge conflict
Robertus Sonny Prakoso
committed
Merge branch 'master' of https://github.com/Dionsaurus/CDC-Workshop into feature_branch
Robertus Sonny Prakoso
committed
try to edit
Robertus Sonny Prakoso
committed
test commit from forked repository
Robertus Sonny Prakoso
committed