Merge pull request #13 from sharanagrawal/master

Student almost complete