committing before pulling
Merge branch 'master' of https://github.com/adamcameroncoldfusion/scratch

Conflicts:
	blogExamples/evaluate/cache/Application.cfc
trying to work around conflict
Dealing with conflict