nothing happened
uppdating
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
mmm
updating
test
merging
orgigin merge
List view layout, no function
Ready for merge with functionality
Deleted unnecessary crap
fixed list
added files
Merging Hanna with local master
Merging Hanna/Master with Anna
Listview bugfix after Hanna-Anna merge
small fix
changed button to get to listActivity to overview button in the menu
merge anna and christoffer branches, listActivity working + timestampActivity working