Laptop changes
Merge branch 'master' of https://github.com/Alexjajones/Notesie

Conflicts:
	.idea/workspace.xml
	app/views/notebooks/show.html.erb