Merge branch 'Ryans'

Conflicts:
	app/views/home.html.haml
Merge branch 'master' of https://github.com/annacho/taodoist
Merge branch 'master' of https://github.com/annacho/taodoist

Conflicts:
	app/views/home.html.haml
fixed migration issue