mere html css
Delete files
Conflict Fixed
Merge pull request #7 from andersdn11/19122014

fasfasf