to enable merge with upstream
trying to fix merge
prior to pull
before Jessica meeting
added tikz test diagrams
added 2 diagrams
adding word conversions
added material to discussion section
Merge branch 'master' of https://github.com/MichaelCumming/mobilehic2014
fixed merge