testing
playing with ignore
Merge branch 'master' of github.com:beigeotter/my_app