Add Ask Question form
Merge branch 'master' of https://github.com/ishg/Team12
Testing JSON update
Merge branch 'master' of https://github.com/ishg/Team12
Ask Question Post Works
Merge branch 'master' of https://github.com/ishg/Team12
Q's
Merge branch 'master' of https://github.com/ishg/Team12
Merge branch 'master' of https://github.com/ishg/Team12

Conflicts:
	public/questions.html
Sir Trevor
Merge branch 'master' of https://github.com/ishg/Team12
Questions Displayed
fix questions
Merge branch 'master' of https://github.com/ishg/Team12

Conflicts:
	public/questions.html
Merge branch 'master' of https://github.com/ishg/Team12

Conflicts:
	public/Questions.html
	public/data/data_92101.json
Answer