auto commit
Merge remote-tracking branch 'origin/master'
Added ElseBlock. Updated Parser to take in String[] and HashMaps. Updated parsing of blocks to be correct.