Merge pull request #1 from VelocityZero/master

Lab2 Writeup
41/41

this is currently giving full credit; however, you And is
underconstruction
Merge pull request #2 from jara8300/master

working, but change and function