Team proposal 1

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Merge pull request #317 from danShumway/master

Team proposal 1