Draft abstract and intro
Fixing conflict

Conflicts:
	writing/AAAI SSS '15/intro.tex