add commit
Merge branch 'master' of https://github.com/dalanmiller/Scotty

Conflicts:
	src/com/cmu/scotty/controller/PdfCreator.java