modified:   ../scripts/run_dup_remove.py
Merge branch 'colleague_game_branch' of https://github.com/jiyinhe/fedweb_ui into colleague_game_branch
	modified:   fw_userstudy/settings.py
	modified:   scripts/setupdb.sh
	modified:   static/css/task_base.css
	new file:   static/img/basic.jpg
	new file:   static/img/category.jpg
	modified:   templates/fedtask/instructions1.html
	modified:   templates/fedtask/instructions2.html
	modified:   templates/fedtask/task_base.html
	modified:   templates/fedtask/task_base.html