bug fixes
Merge branch 'marta'
scale
new style
Merge branch 'master' of https://github.com/haljin/connections
visual project
not again
ready to merge
phew