CSS file uploaded

Checked - and all selectors work fine
Merge branch 'gh-pages' resolve conflict

Conflicts:
	index.html