Assign a person to a todo item
Merge branch 'master' of https://github.com/DesertSnow/syfuun

Conflicts:
	app/views/todos/index.html.haml