testing on my side
Merge branch 'master' of github.com:healthVT/projectVT

Conflicts:
	src/com/example/projectVT/mainActivity.java