fixing merge
Merge branch 'master' of github.com:javiros/brides