adding everyone elses changes to my branch