committing before pulling to update
Merge branch 'master' into ryan
fixing merge conflict
fixed merge conflict