changed makefile again
Merge remote-tracking branch 'upstream/master' into mybranch
made globals static in slug.c
Merge pull request #35 from dlazell/mybranch

Mybranch