fix merging issues and setup project dependencies #32

Closed yuyoyuppe closed 6 years ago