vagrant file
Merge branch 'master' of https://github.com/softme/xpomo

Conflicts:
	composer.lock