manual merge of chrisalcantara PR 13

some students PRs