teacher done and question 1
merged with developer
Merge pull request #21 from yenbryan/adamdev

Adam merge