fixed todos
Merge branch 'master' of https://github.com/Vectovox/DAT240-2014-Group3