sharanya's first commit
Merge pull request #6 from lilweirdward/gh-pages

Merge pull request #5 from lilweirdward/master
Merge pull request #7 from lilweirdward/master

stuff