Update code.txt
add new line for code.txt
evtstore add a new line
fix conflicts between master and tmp
Merge branch 'evtstore'