ingen ändring
ingen ändring
Merge branch 'master' into August
ingen fix
ingen fix
grundlayout för timestampview
R-fil
Database class is done, Block/Order class update
bakgrund tillagd vid knapparna
small changes
done the gui-stuff to login
new bg color
Merge pull request #16 from TobyPalmer/Tobias

Tobias
R.java
mergefix
Merge branch 'master' into christoffer
Merge branch 'Jimmie'

Conflicts:
	TimeManagement/src/com/example/timemanagement/model/Block.java
Minor change
Ignoring .orig files
Merge branch 'master' into christoffer