removed files
Fix merge conflicts
Added more mappings during the example session
Merge branch 'master' of github.com:nmrML/nmrML