modified todo
Merge branch 'master' of github.com:janbre/noob_hackathon
Merge branch 'master' of github.com:janbre/noob_hackathon