merge conflicts
home page fixed
Merge pull request #143 from tdoshi/master

home page fix