Alex_New_Change
Merge branch 'master' of github.com:fms-serin/todoapp

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