blocked fixed and search begun
Merge branch 'master' of https://github.com/HampusEngstrom/databasprojekt

Conflicts:
	src/cookiePackage/CookieGUI.java