Added Trisquel6 box
Merging in changes.
Merge branch 'oogg06-master'