merge
local
teacher styling
teacher portal finish
merge with developer
Merge pull request #32 from yenbryan/adamdev

Adam