makefile update
Merge branch 'master' of https://github.com/jwelch1324/wloop
makefile update + some library changes
Works on Alex's machine now.