...
Merge branch 'master' of https://github.com/mjhandy/fls-wpTemplate

Conflicts:
	src/functions.php