final presentation
Merge branch 'dev' of https://github.com/amandagroccia/SUNYSDE2014 into dev

Conflicts:
	paper/presentation/presentation.pdf