Delete php.ini-phpup-1397141242
Delete error_log
Delete .ftpquota
Updated Gitignore
Merge remote-tracking branch 'origin/master'