Map sticked to design

Signed-off-by: franszo <josh@kishandchips.com>
finished Collab map

Signed-off-by: franszo <josh@kishandchips.com>
Merge branch 'master' of github.com:kishandchips/epigeum
fixes & merge

Signed-off-by: franszo <josh@kishandchips.com>