Merge pull request #1 from definetux/master

Update master
asd
mytext
Merge remote-tracking branch 'origin/master'

Conflicts:
	SketchPad/SketchPad.v11.suo
фыв
add