Merge branch 'master' of heroku.com:yosistemas2014
Merge branch 'master' of heroku.com:yosistemas2014

 especially if it merges an updated upstream into a topic branch.
Merge branch 'master' of heroku.com:yosistemas2014
Merge branch 'master' of https://github.com/israelantezana/yosistemas

 Please enter a commit message to explain why this merge is necessary,
Merge branch 'master' of heroku.com:yosistemas2014