oijpi
Оставляю только папку home с исходниками
Merge branch 'master' of github.com:slavmak93/test_system

Conflicts:
	Phpedit/cursor_pos.ini
	Phpedit/data/last_session.dat
	Phpedit/data/search_history.dat
	Phpedit/settings.ini
	usr/local/mysql-5.5/data/acerw700.err
	usr/local/mysql-5.5/data/acerw700.pid
	usr/local/mysql-5.5/data/ib_logfile0
	usr/local/mysql-5.5/data/ibdata1
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYD
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYI