modified .gitignore
modified .gitignore
fooooo
Merge branch 'master' of https://github.com/srecnig/clonecloneclone

Conflicts:
	.gitignore