copy1
Merge remote-tracking branch 'origin/temp'
Merge branch 'master' of https://github.com/JMinions/module2

Conflicts:
	EatUBC/res/values/strings.xml