conflict resolved#14

Open

theodorusyoga wants to merge 6 commits intoDionsaurus:masterfrom

theodorusyoga:feature_branch

Commits on Nov 22, 2016

modify deathstar.json and add a new file
Dionsaurus
committed
add some fancy features
Theodorus Yoga
committed
add some fancy features
Theodorus Yoga
committed
merge
Theodorus Yoga
committed
Merge pull request #10 from theodorusyoga/feature_branch
Dionsaurus
authored
conflict resolve
Theodorus Yoga
committed