More on index.html and main.css
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck

Conflicts:
	index.html
no message
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck