un-ignoring htaccess
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool

This is a git pull.
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
Merge branch 'master' of github.com:blackandblack/tide-and-pool
added w3tc cache plugin
fixed permisions