got two working database method
fixed some issues, and created populate class for testing
todays work, not working
small change
merged master timesheet
Merge branch 'master' into Espen_test
Added json libraries
DB STUFFIN THEM TABLES
DB STUFFIN, sOME ShIT Izz WORKInG
Tested tostring method in user, and created empty constructor
Logged hours for tuesday 11.03
added some missing fields
did stuff
added some alarm stuff
fixed mergeconflict
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
Merge pull request #14 from finninde/wienUI

Wien ui