.
Merge branch 'master' of https://github.com/Cascadia-JanetR/FRIENDS-Trivia

Conflicts:
	app/gen/edu/cascadia/friendsfantrivia/R.java