Laptop gitignore?
Added to-do comment from laptop

Merge branch 'master' of https://github.com/jejoenje/SWBSG

Conflicts:
	doc/.gitignore