gallery merge
Merge branch 'master' of https://github.com/scottyc1000/Wordpress-Base-Theme
playa refactor