Fixed redo bug
Merge branch 'feature/undo/refactor' into develop
Fixed redo bug
Merge branch 'feature/undo/refactor' into develop

Conflicts:
	spec/javascripts/undotree_spec.js
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop