update for merge
Merge branch 'development' of github.com:climbingcode/bam- into premissions
all
Fixed merge conflict.