merge conflicts :(
merging
merge conflict
routes workinggit add .
some css stuff
Merge pull request #42 from Eventalist/tdshap

Tdshap