merging
Merge branch 'master' of https://github.com/raduy/compilers

Conflicts:
	lab01/html/one.html
	lab01/regex.py
Merge branch 'master' of https://github.com/raduy/compilers
some version problems