删除垃圾

删除垃圾
gitignore

gitignore
Merge branch 'master' of https://github.com/imarry/web

Conflicts:

	z17/tpl/_compiled/0a66694e0303840deb7f4282935c9b482fefc761.file.9izbdq_passport_jdlogin.tpl.php

	z17/tpl/_compiled/2bd45af1df8d6e03130b8fb7271a4fb5a3f507d1.file.profile.tpl.php

	z17/tpl/_compiled/4610687cc7316df1038812293d2186560282d2fa.file.payment.tpl.php

	z17/tpl/_compiled/4658190390544f11172a14d3fe6f1c4d885fb459.file.9izbdq_block_menu.tpl.php

	z17/tpl/_compiled/59796c8b37354dceab06b902616c567f7ba3d9fe.file.block_footer.tpl.php

	z17/tpl/_compiled/64b1aaf472caf3820e10224f1e855ac5e9db666f.file.hi.tpl.php

	z17/tpl/_compiled/84319e3c0c6b41061006d4153db869fd977866c2.file.block_head.tpl.php

	z17/tpl/_compiled/9c5fdb060bf27bf87f41051e0a72a3187912705d.file.9izbdq_index.tpl.php

	z17/tpl/_compiled/b3a50ae0bf1b3ed2b7fd859ec100becd8213e8df.file.message.tpl.php

	z17/tpl/_compiled/fdcbf3730add9f7974cff50ee449d5820d133ae3.file.9izbdq_block_footer.tpl.php