desktop styles added
desktop layout: bugs fixed
Merge branch 'master' into part3_task2

Conflicts:
	index.html
Merge branch 'part3_task2't push origin master