updated todo as user1
Merge branch 'master' of github.com:prashanthkr/gitReal2

Conflicts:
	todo.txt