when you pull into the main branch don't forget to go with cheridan's changes to certain parts. I accidentely got rid of them when i pulled the main branch.