More...
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck

Conflicts:
	css/main.css
	index.html