1
Merge branch 'master' of https://github.com/carusocr/sinatra-todo

Conflicts:
	todo.rb
	views/home.haml
Merge branch 'master' of https://github.com/carusocr/sinatra-todo
rename todo.txt