"2nd commit micka"
Merge branch 'master' of github.com:mcoenca/back-end

Conflicts:
	README.md

"Merge test1"