123
Merge branch 'master' of https://github.com/n24chris05/BNR

Conflicts:
	Quiz/Quiz/BNRQuizViewController.m
commit