changed todo
- lokup
- updated TODO
Merge branch 'master' of https://github.com/wunki/rockstart-pimpin

Conflicts:
	todo