Merge pull request #20 from KellyBlack/Dev

Merged changes from multiple sources and deleted aux files.
Merge pull request #23 from TatyaniaM/Dev

Dev
Merge pull request #24 from TatyaniaM/Dev

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

Conflicts:
	paper/presentation/presentation.pdf
idk
hgjhgk
Merged from Kelly's repo
Merge branch 'KellyBlack-Dev' into dev
Merge pull request #29 from amandagroccia/dev

Dev