Uh
Merge branch 'master' of github.com:grahamcracker/grapefruit
Finished basic pages for admin panel, got form working for creating students and instructors, some minor changes to views
remove irrelevant is_admin field
Merge branch 'admin_panel'