Fixed shift/reduce
Merge branch 'master' of https://github.com/alexnikleo/Compilers