before merge
before merge
before merge
modal css update
Merge pull request #14 from yenbryan/peterdev

Peterdev
local
local
student side finish
make it dry
teacher templates 1
merged with adam