Merge branch 'martin' of https://github.com/LucasFyl/streetart into martin

Conflicts:
css/less/main.css
conflict resolved