...
Merge branch 'master' of https://github.com/adeelateeque/MR

Conflicts:
	src/main/java/com/codurs/meetroulette/ui/ChoiceFragment.java