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

Conflicts:
	.gitignore
Merge pull request #6 from martafonda/tripgeneration

Fixed assets