add berks lock to gitignore
Merge branch 'master' of github.com:cloudware-cookbooks/ktc-openstack-ha

Conflicts:
	Berksfile.lock