second fix for nens/lizard-nxt#398
changes
Merge pull request #240 from nens/fritz_username

second fix for nens/lizard-nxt#398
resolve mc locally
sassen
Merge master
at least it builds
Merge branch 'integration' of github.com:nens/lizard-client into integration
one font family
watch not triggering
Prevent flickering crosshair cursor for line tool
it's OK (until major refactoring)
cleanup
colors names
changes to sassing
merge resolved
carriere console.log
move it around, remove redundancy
bootstrap override for progress bar
color overwritten