First Commit  to branch my-wp
added copyright year
added copyright year
Merge remote-tracking branch 'origin/my-new-feature' into my-wp

Conflicts:
	wp-content/themes/twentyfourteen/header.php
removed copyright year
added
testing