trying to incorporate dispositions in the appropriate place
Merge branches 'master' and 'master' of https://github.com/specialorange/IDC2014

# By Michael Stewart
# Via Michael Stewart
* 'master' of https://github.com/specialorange/IDC2014:
  reworked conclusion
  merged takis’s changes from the docx

# By Michael Stewart
# Via Michael Stewart
* 'master' of https://github.com/specialorange/IDC2014:
  reworked conclusion
  merged takis’s changes from the docx

Conflicts:
	sigproc-sp.pdf
	sigproc-sp.tex
updated disposition definition