Testing file for diff viewer (standalone locally run version)
Merge branch 'master' of github.com:JFrei86/HWserver
Merge branch 'develop'
Removed sample_directory
Merge branch 'server'