agregado archivo what's happening.txt

blah blah blah
Merge branch 'master' of https://github.com/jorgeaguirre/jrgadmin