Hello
/bin/bash: q: command not found
Merge branch 'master' of https://github.com/danivenk/J-Query

Conflicts:
	css.css
	index.php
LLLLLLLLLLLLLLLLLLLLLLLLLLLLllaaaaaaaaaaaaaaaaafwsgrefhtrhrtjhryjryjyrjytjryjryjyrjryjrry
Die Mauer
Merge branch 'master' of https://github.com/danivenk/J-Query

Conflicts:
	css.css
	index.php
Merge branch 'master' of https://github.com/danivenk/J-Query
Al