merge
local
teacher styling
fixed misplaced action button
Merge pull request #29 from yenbryan/peterdev

fixed misplaced action button
added more testing
Merge pull request #30 from yenbryan/dev-bryan

whoa, lots of file changes
teacher portal finish
merge with developer
Merge pull request #32 from yenbryan/adamdev

Adam
fix merge