Merge pull request #1 from TheTifster/master

html and css
commit

forem/html
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
update style
gitignore
Merge pull request #1 from Skwidensky/master

Merge