Clean up
Merge branch 'master' of github.com:jpercent/foneem
Remove automerged file