Updated the toolbar with Pictures
New File added
Added files
text editing mostly done
added css
Add files
Merge branch 'ahmad'
delete old toolbar
Merge branch 'brian'
d
Merge branch 'master' of https://github.com/benzenittini/azosc into ahmad
Merge remote-tracking branch 'origin/kilian'

Conflicts:
	client/index.html
	client/js/toolbartest.js
Merge branch 'master' of https://github.com/benzenittini/azosc into ahmad
Update name
Iron Hand
Merge remote-tracking branch 'origin/ahmad' into kilian