asdf
Merge branch 'triton_branch' of https://github.com/simena86/paralell_programming into triton_branch