Fix template issues
Merge branch 'master' of github.com:colonelxd15/wordpress-theme