Update README & credits
README
Merge branch 'master' of github.com:Nuwen/MAFIA

Conflicts:
	README.md