ctrl-z undo; ctrl-shift-z redo
Merge branch 'master' of github.com:dteixeira/MadsCollaborativeIDE
ctrl-z undo; ctrl-shift-z redo