allowed canvas to change brush size
Merged controls branch into brushsize