ingen fix
ingen fix
R-fil
small changes
done the gui-stuff to login
Merge branch 'master' into christoffer
Merge branch 'master' into christoffer
added login GUI
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
added login-GUI
fixed some func and login GUI
Merge pull request #20 from TobyPalmer/hanna

Hanna
satistics view
created all views
merging