style test
Merge branch 'master' of https://github.com/OneTimeUser/weeks

Conflicts:
	wp-content/themes/.DS_Store
	wp-content/themes/weeks/style.css