Merge branch 'master' of https://github.com/niklas-r/LESS-Template