Merge pull request #145 from timwindsor/master

Adds Kristoffer Flores
Merge pull request #146 from timwindsor/master

Adds Walkline Wang