added kkkk and removed temp file
Merge branch 'darie_branch' into oscar_branch
tidied up
added convert module
removed normalisation in raw2numpy function
+oscar file