Clean branch

What I did:
1.reset this branch to the last pull from upstream(Brandon's repo) 

2. pulled latest changes from upstream

3. added all the local files I changed and used git checkout cleanBranch -- <filename> to unstage changes to files I haven't touched

4. committed and pushed to my repo