add to git ignore
Merge branch 'master' of github.com:benmliang/fieldr