Ignore das4 log files
Merge branch 'master' of github.com:mvandervelden/Masterthesis
Merge branch 'master' of github.com:mvandervelden/Masterthesis
bugfixed quickshift, few scripts
Merge branch 'master' of github.com:mvandervelden/Masterthesis