Agregado el .travis.yml
Merge branch 'master' of https://github.com/Jonakoelbl/Re-conference

Conflicts:
	La_Re-Conference/.travis.yml