fix conflict
Merge branch 'master' of https://github.com/evilband7/porn.git

Conflicts:
	public/index.php
before pull
Merge remote-tracking branch 'origin/master'
..
Merge branch 'master' of https://github.com/evilband7/porn.git
aa