first commit
Merge branch 'master' of github.com:mfbmina/compiladores

Conflicts:
	.gitignore