try 2
try 3
Merge branch 'master' of https://github.com/BonsaiMediaGroup/veloMobile

Conflicts:
	src/main.js