Removed vendor files and updated and cleaned .gitignore
Merge pull request #3 from martafonda/responsiveframework

Responsiveframework
Merge pull request #5 from martafonda/tripgeneration

Tripgeneration
Merge branch 'master' of github.com:martafonda/makeyourtrip into tripgeneration

Conflicts:
	.gitignore