ignore sup-excetion-log.txt
Merge branch 'develop' into remove-server
remove server stuff from sup-files