dsf
Merge branch 'master' of https://github.com/EvertLagerberg/pruttlab6.git

Conflicts:
	pruttlab6/bookmarks.txt
	pruttlab6/src/pruttlab6/Bookmark.java
	pruttlab6/src/pruttlab6/View.java