commit 1
Merge https://github.com/jabgibson/noteHack