github being stupid

wants me to commit a file with no changes before i can pull
Merge branch 'master' of https://github.com/Yacob/TowerDefense