modified makefile
Merge branch 'master' of git://github.com/hal3/ngdec
local edits
added prep-test
resolved diffs
fixed bunch of bugs, got rid of some allocs