Merge branch 'master' into chris
changed colors to variables
changed colors to variables
Merge branch 'master' of github.com:TobyPalmer/Agilen into chris
Bug fix. Markera och avmarkera alla funkar ännu bättre. Total time funkar
gui fix in listactivity
merge fix
Nu funkar total time
Merge pull request #51 from TobyPalmer/felicia

Gui fix in List activity
Merge pull request #49 from TobyPalmer/chris

Lite mer bug fux
småfix
Merged Master into Jimmie