lade till en ignore i .gitignore
Merge branch 'master' of https://github.com/TheDragonsShadow/WebStore
gjort grunden för UI
merge
merge
Merge branch 'master' of https://github.com/TheDragonsShadow/WebStore
fixat med UI
mergade
Merge branch 'master' into category_ui

Conflicts:
	src/tddd24/project/client/WebStore.java
	war/WebStore.css