.DS_Store added
Delete .DS_Store
Delete .gitmodules
Edit .DS_Store
deleted .gitmodules
ter' of https://github.com/ArmandoAmador/todos

Conflicts:
	.DS_Store
Modify .DS_Store
Delete .DS_Store
Delete .DS_Store
Merge branch 'master' of https://github.com/ArmandoAmador/todos
add .gitignore