a demo of merge#1

Open

hogwild wants to merge 25 commits intoIntrotocs:masterfrom

hogwild:master

Commits on Oct 21, 2017

Add file for ICS Fall2017
Hogwild
committed
a new file for mynewbranch
Hogwild
committed
delete the newbranchfile
Hogwild
committed
the solutions of Cuboid
Hogwild
committed
the solution of dice
Hogwild
committed
remove the starting codes
Hogwild
committed
use parameter u
Hogwild
committed
the test is finished
Hogwild
committed
a new folder with files
Hogwild
committed
Update fileinfolder
hogwild
authored
modified readme
Hogwild
committed
Update README.md
hogwild
authored
readme modified
Hogwild
committed
conflict solved
Hogwild
committed

Commits on Nov 1, 2017