Added in crosslinking method.
Resolved merge conflict.
resolved merge conflicts.
Merge branch 'master' into 1456-crosslinking_method
Removed extra line.
Merge pull request #293 from ENCODE-DCC/1456-crosslinking_method

#1456 crosslinking method