removed backup files
conf.lua~
love.conf~
main.lua~
mc~
Merge branch 'master' of github-mc1472:mc1472/test