Merge pull request #2 from ZackAlfakir/master

ANIRUDH ACCEPT THIS
...fine
stuff
Merge pull request #3 from swarage/master

small changes
merged 1/11/14 code that was done with the beginners