get ready for step 2
tokens.h is no longer necessary
Merge branch 'master' of https://bitbucket.org/schnorr/compil-2014-1

Build is broken, must be fixed.

Conflicts:
	scanner.l
	src/main.c