updated todo
got rid of one two many print \n
Merge branch 'master' into testing

Conflicts:
	batchgit