Merge.
Merge branch 'master' of github.com:jordanell/Papers
iced 2014 draft one done.