derp
fixing derp
Merge yet again
sound
fixed the sound and the lib int he makefile
Merge ecegit:ysl89/project into ysl89-development
Merge branch 'ysl89' of ecegit:ysl89/project into ysl89-development
Fix minor errors