dumb change
Merge branch 'jon' into sprint14
skip log files
app.yaml
Sprint15 created