Views extend base view
Views extend base view
Merge branch 'feature/pane' of github.com:Derkje-J/programming-life into feature/pane
Added working pane
Can add views to Base view
Merge branch 'develop' into feature/pane

Conflicts:
	app/assets/javascripts/views/module._.js.coffee
Pane has a white background and no contents
Merge branch 'feature/pane' into develop