Getting up to date

Is this the best way to do this? Github is such a pain. Forks to create new branches, asking permission every time I want to receive your changes. Ugh. 

Well, at least we're gonna be working on different files.