ingen ändring
ingen ändring
Merge branch 'master' into August
grundlayout för timestampview
bakgrund tillagd vid knapparna
small changes
new bg color
R.java
mergefix
Merge branch 'master' into christoffer
Merge branch 'master' into christoffer
fixed merge
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
Merge branch 'master' into August
Blocks may now have comments
Extract time as long bug
database sync with GUI
Merge pull request #18 from TobyPalmer/August

August
conflict fix
Gui stuff