CRLF -> LF
conf.php -> conf-default.php
Add conf.php to .gitignore
Merge pull request #57 from tttptd/master

CRLF -> LF, conf.php -> conf-default.php