Merge pull request #5 from stuycs-ml7-projects/master

update
changed the input a bit
Merge pull request #6 from stuycs-ml7-projects/Teehan

Teehan