View Profiles
Merge branch 'master' of ssh://who.gonzalezr.cl/root/armagedon.cl/tor into dev
Torneos al Azar
Merge branch 'master' of github.com:SeGonzalezR/ArmagedonTorneos into dev

Conflicts:
	app/database/seeds/TornamentsTableSeeder.php
Merge pull request #5 from SeGonzalezR/dev

Dev