Added more changes to CSS and HTML
conflicts resolved
Merge pull request #15 from reboryan/master

Added more changes to CSS and HTML