Adding Jason and Vinay's code together + Avinash's repeat. Cleaning mast...

...er branch repo.