maven pom file
correcting previous commit, where some compile code was committed
files and folders to be ignored
initial draft of classes that will read the acquisition files
Merge branch 'develop' of https://github.com/LuisFF/nmrML into read-acquisition-file
Merge branch 'upstream-master' into develop
working example with ini files that map bruker parameters with ontology terms
adding more parameters from the acquisition parameter list. Added the fid byte array to the nmrML. Fixing the way I read the acqu file in order to avoid redundancy.
new method to load the sourcefiletype using the filenames stored in the bruker.ini
Merge branch 'develop' into features

Conflicts:
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/BrukerAcquAbstractReader.java

took the code from the development branch. had to correct the AcquReader class.
Moved the method that loads the bruker file location into a separate class.
consider the case when the sourcefilelist is not loaded
Merge branch 'upstream-master' into develop

Conflicts:
	.gitignore

New updates after the hackathon in Halle.
update of the automatically generated classes based on the new version of the nmrML.sxd file. Correction to the converter package, AcquReader class had disappeared.
Merge branch 'upstream-master' into develop

Conflicts:
	.gitignore

updates from the main branch of nmrML
one last change from all to sequence and remove an unsupported option to get xjc compiling.
updating the model to use the most recent nmrML schema.
update the acqu reader to use the new classes. Tests seem to be working
Merge branch 'develop' into load-source-files

Conflicts:
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/AcquReader.java
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/BrukerAcquAbstractReader.java

update to the model
created a unit test for the BrukerSourceFileListLoader