#31 - resolved the following issue
Merge branch 'master' of https://github.com/TeamGreyJoy/Forum

Conflicts:
	app/client/loadQuestions.js