Resolving conflict
resolving conflict
Merge branch 'master' of ssh://git@github.com/pglotfel/weddingsite.git

Conflicts:
	WeddingSiteGWT/war/WeddingSiteGWT.css