Merge branch 'master' of https://github.com/L7Lynx/

Conflicts:
	css/myStyle.css
merge complete :)