Added Location to lex and yacc
LOCATION keyword now refers to the player's current location
fixed merge conflict
Merge branch 'master' of https://github.com/msuozzo/IFL