initial changes to get started
deleted some sdls
modified Makefile
Merge branches 'trimbranch' and 'master'