medication style
Merge branch 'master' of https://github.com/gtaranas/todo-list-app

Conflicts:
	todo-list-app.v11.suo