Added a search function, blew it into pieces, rebuildet it... - Tanja
Status commit before pull - Tanja
Merge branch 'master' of https://github.com/KritterCederholm/Ca4WikiThing

Conflicts:
	public/app/viewCategories/Categories.html
	public/index.html
Reperationscommit - Tanja