criando o projeto
Merge branch 'master' of https://github.com/acristinar/keepcalm

Conflicts:
	.gitignore