ignoring inc/config.php
emojis, using php-emoji by @iamcal https://github.com/iamcal/php-emoji
Merge branch 'emoji'

* emoji:
  emojis, using php-emoji by @iamcal https://github.com/iamcal/php-emoji
  ignoring inc/config.php

Conflicts:
	.gitignore
	inc/config.php
	inc/header.php
	inc/html.php
	inc/preheader.php