Adds Kelsey and Jake
pushing all changes from serer code into master