conflicts resolved regardng positionaing of page
Merge pull request #10 from sunnyLA4/fresh

resolved conflicts
minor conflicts resolved in sunnyLautner repo
Merge pull request #216 from rishy/master

conflicts resolve in sunny repo