idea files added to gitignore
doc and erwin removed from gitignore
Merge branch 'master' of https://github.com/volterr/FavorTripPals

Conflicts:
	.gitignore