Changes
easychair stuff added
merge conflict solved