Adding Haystack
Merge branch 'master' of https://github.com/xmas11/JNP3