changed q controller
working on live editing questions
editing questions works
changed display of questions page
updated answer fields
reconciling
merging conflicts
fixed merging conflicts
charts now working
restyling front page
begun styling questions page
fixed merge conflict
basic styling completed