Ryan

merging my changes with master file