Went to Tsec event
tsec even has not started yet
Merge branch 'version3'

Conflicts:
	todo.txt