Commit inicial
Merge branch 'master' of github.com:cherra/beef

Conflicts:
	.gitignore