resolved css html conflicts
Merge pull request #31 from Eye-Static/zach

resolved css html conflicts