Fixed merge
fixed parser bug, implemented literal lists, and other literals