Merge branch 'dev'
fixing links in about
links
Merge branch 'dev'
master
h2 on separate lines
nhfiplus
almost ready
getting rid of stuff
minimal version
Merge branch 'master' into dev