Merge branch 'master' into Ryans
add welcome page
Merge branch 'homepage_style' into Ryans
Merge branch 'Ryans'

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