small change
merged master timesheet
Merge branch 'master' into Espen_test
Added json libraries
Tested tostring method in user, and created empty constructor
Logged hours for tuesday 11.03
Did some network test, testing threads, threaded tcp server and json
Logged hours for wednesday 12th march
deleted jackson libraries in maven, and added a relasjonsskjema in db2
Fixed merge issue appointment service