Merge branch 'master' of /var/www/Tipsy-CMS with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Все только начинается...