.gitignore update
Merge branch 'master' of github.com:coyosoftware/oneview

Conflicts:
	.gitignore