Merge pull request #212 from rishy/master

very minor changes in css
conflicts resolved regardng positionaing of page
Merge pull request #10 from sunnyLA4/fresh

resolved conflicts
minor conflicts resolved in sunnyLautner repo