Changing to TODOs, editing title, re-factoring
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	presentation.org
Adding IDS and IPS info