Some collision debugging
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp14/projects/gb2/andrew16-changc-mikaelm
Using different parser now
neatened up some of the grammar so adding grammar rules for phase 2 will be easier, fixed FireExit rules due to grammar changes
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp14/projects/gb2/andrew16-changc-mikaelm
merging
Added key grammar
Added portal grammar rules, note that portal and keyboard implementation with board not done yet