Minor changes

change todo to @todo and css change
fixed css name

conflict was resolved inside the file
Merge branch 'master' of https://github.com/danielrasmuson/Stratego2

Conflicts:
	html/boardlist.html