changed to local db on master
syncing up
what.
Merge branch 'master' of https://github.com/trutty/SWE-ePass
removing crap-file
removing TODO without extension, printer issues
DIIIIIEEEEEEE
merging branches
Merge branch 'master' of https://github.com/trutty/SWE-ePass
found lost crap
really merged files from server this time
Merge branch 'master' of https://github.com/trutty/SWE-ePass
Merge branch 'master' into server
....