debug
Merge branch 'dev' of https://github.com/firestar300/frotey2 into dev

Conflicts:
	wp-content/themes/frotey/style.css