Fixed bug. Should be a working version now.
Merge branch 'master' of github.com:triptate/cs107-assn-1