error stuff
Merge branch 'master' of https://github.com/jremmons/auto_assignment_nmr