new stuff 01_22_14 Also a test
project files
with makefile
Merge pull request #1 from funkayMan/origin/funkay_dev

Origin/funkay dev