hmmm
Merge branch 'master' of heroku.com:whispering-wave-3246
 It's getting hard to keep up with the crap I've trashed
 -empty-
Merge branch 'master' of github.com:Brainshots/triviapsu
 template y vista 1
Merge branch 'master' of github.com:Brainshots/triviapsu