teacher page working
teacher page working, dealt with merge issues
small change
Merge pull request #11 from amulius/josh

Josh