Merge branch 'front-end-dev'

Conflicts:
	.gitignore
Added mail to others in brag, fixed cc/bcc issue

cc/bcc doesn't play nice with array
fixed typo error in quiz controller
Merge branch 'master' into front-end-dev

Conflicts:
	.gitignore