Testing
Merge branch 'master' of ssh://git@github.com/Stophe/Work-scripts.git
Managed conflicts
Added old stuff to convert script again.