test 4
Merge branch 'master' of https://github.com/bholub/wodtogether-phonegap.git

Conflicts:
	index.html