Merge branch 'master' into John-DiBaggio
fixed conflict

fixed conflict
Merge branch 'John-DiBaggio'
Merge branch 'master' into John-DiBaggio
commented out some logs

commented out some logs
Merge branch 'John-DiBaggio'
Merge branch 'master' into John-DiBaggio
removed log

removed log
Merge branch 'John-DiBaggio'