Updates to gitignore
Matching classname to filename
Merge branch 'master' of https://github.com/dalanmiller/Scotty

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