Removi os caracteres de fim-de-linha desnecessários.
Merge branch 'master' of github.com:cosmochefe/Strawberry

Conflicts:
	scanner.h