merged john's branch with mine
remerged master
finished merging master