Edited in Mainclass
Wensday after a day gone /Andrea
merged files
Merged files, deleted Main
commiting changes
Merge branch 'master' of github.com:andberg/adi-scrum
Categories in DB changed to ENUM
Merge branch 'master' of github.com:andberg/adi-scrum
Dannie, Isak and Andreas code all updated to resultType Enums