some style
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
Merge branch 'master' of github.com:hwestman/weddingWestman
test
Merge branch 'master' of github.com:hwestman/weddingWestman

Conflicts:
	header.php