Update Todo
Update Todo
Add ga
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-10-21-todo.md