some stuff
Merge branch 'lars' of github.com:larsbuntemeyer/FLASH2.5 into lars