Switch
Merge branch 'master' of https://github.com/joaovcarvalho/UFRJCompiladores2014

Conflicts:
	trabalho.y