..
Merge branch 'master' of https://github.com/v-well/v-well

Conflicts:
	.gitignore
..
Merge branch 'master' of https://github.com/v-well/v-well
Merge branch 'master' of https://github.com/v-well/v-well
Merge branch 'master' of https://github.com/v-well/v-well