added gitignore
updated assignments. got rid of reduce/reduce conflicts in parser