Bring README back to main dir
Fixing Makefile
Merge branch 'dev' of https://github.com/niltonvasques/marvin into dev
Moving gitignore to main dir
Removing img
Another change in Makefile