resolving merge conflicts
Merge branch 'master' of https://github.com/tomasro27/VRFitness-companion

Conflicts:
	VRFitness/mobile/src/main/java/com/hacktx/vrfitness/LoginFragment.java
	VRFitness/mobile/src/main/java/com/hacktx/vrfitness/MainActivity.java