creating login modal, partially complete, not working
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
removed unnecessary login ajax request
made some tweaks to login and edit account, but login modal still throwing errors
for julain
Merge branch 'dev' of https://github.com/amulius/group-project-base into student_frontend_jeff
preparing for merging with Jeff's branch
Merge branch 'student_frontend_jeff' of github.com:amulius/group-project-base into login-julian

Conflicts:
	slides/forms.py
	slides/templates/base.html
preparing for jeff to merge my changes into his branch
Merge pull request #17 from amulius/teacher-backend

Teacher backend
getting ready to merge with dev which now has all of joshs teacher backend updates
fixed merge conflicts
Merge pull request #18 from amulius/teacher-backend

fixing images
new merge
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
style questions page
fixed account view
update js for action button
fix conflict in base
fix conflict merge with Julian