phil changes
Merge remote branch 'upstream/master'
phil again
phil again
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
hopefully it has all synced
removed debug code