deleted fixtures
styled question box
Merge branch 'front-end' into rails
Merge branch 'master' into rails