Merge pull request #1 from TeamCherry/News

News
Update and rename questions.html to discussion.html
Rename discussion.html to question.html
Stupid mistake..
Merge pull request #2 from TeamCherry/Home-Page-Edition

Home Page Brand New Edition
Merge remote-tracking branch 'origin/master' into About-Edition

Conflicts:
	questions.html