pushing and pulling updates from ryan
stashing old files for updates
merging all changes to local