Deleted file
Merge branch 'master' into NewBranch
Just did a back merge! Whoa!