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
Merge pull request #6 from jessp/master

Wearable tech for children reframe
fixed merge
before major edit to fit 4 page max
put diagrams in margins; some chopping down of text
updating doc files
merge
trimming down to 4 pages
future work section
added new references; future work
send to Adam
minor stuff