2015fellows merge to get my master up to normalz