Manually merging

Merged files in acl2014_master.bib, starsem2014_edited_master.tex