I didn't add these files....but had to commit to resolve a conflict
Exception
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development

Conflicts:
	.settings/com.vaadin.integration.eclipse.prefs