aded categories, fixed subdomains--posts not working
fix conflict
fix conflicts