added readme.md to test jira integration. OV-302
Initial commit
Merge branch 'develop' of https://bitbucket.org/smartsoftovisto/ovisto into github_master

Conflicts:
	.gitignore
	Cheffile
	README.md
	Vagrantfile
	data/composer.json
	my_cookbooks/app/attributes/default.rb
	my_cookbooks/app/templates/default/sites-available.default.erb
Conflict fix
Run composer install on start up
Fix Vagrant << error
Merge pull request #5 from robintema/master

Vagrant fixes