Added some test file from Linux OS
clean up
Merge branch 'master' of https://github.com/ckalas/returnofthecups
fixed up makefile for multi-OS