Fixes conflicts
Merge branch 'master' of github.com:scottrice/Mosaic
Adds correct spacing for markers