style questions page
update js for action button
fix conflict in base
fix conflict merge with Julian
Merge pull request #19 from amulius/style-help-page

style questions page
try to fix modal and merge with julian
fixed merge conflicts
ready for jeffs branch
fix image upload in edit page
Merge branch 'dev' of https://github.com/amulius/group-project-base into student_frontend_jeff
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
Merge branch 'student_frontend_jeff' of github.com:amulius/group-project-base into login-julian
fixed login modal, still needs styling