Update added the decoder.
Corrected the conflicts with PicoFile.java

Merge branch 'master' of https://github.com/jmcarter9t/jpico

Conflicts:
	src/ornl/pico/io/PicoFile.java