Started bootstrap undo view
Started bootstrap undo view
Somewhat buggy basic working undo view
Merge branch 'develop' into feature/undo/bootstrap
Merge branch 'feature/undo/bootstrap' of github.com:Derkje-J/programming-life into feature/undo/bootstrap

Conflicts:
	app/assets/javascripts/views/main.js.coffee
	app/assets/javascripts/views/pane.js.coffee
	app/assets/stylesheets/main.css.scss
Forgot to git add
Made undo a little more functional
Made undo a little more functional
Merge branch 'develop' into feature/undo/bootstrap

Conflicts:
	app/assets/javascripts/models/cell.js.coffee
	app/assets/javascripts/models/module._.js.coffee
	app/assets/stylesheets/main.css.scss
	spec/javascripts/helper_specs/mixable_eventbindings_spec.js
	spec/javascripts/model_specs/cell_spec.js
Merge branch 'feature/undo/bootstrap' of github.com:Derkje-J/programming-life into feature/undo/bootstrap
Branching now supported
Merge branch 'develop' into feature/undo/bootstrap

Conflicts:
	app/assets/javascripts/helpers/mixin.timemachine.js.coffee
	app/assets/javascripts/models/node.js.coffee
	app/assets/javascripts/models/tree.js.coffee
	app/assets/javascripts/models/undotree.js.coffee
	app/assets/javascripts/views/raphael._.js.coffee
Merge branch 'feature/undo/bootstrap' into develop