workspace.xml
Fixed artifacts
new .war
Deleted old artifact
new jackson, fixed pom.xml
/target
workspace
trying to remove .idea
merge
Merge branch 'javabackend' of https://github.com/Studentmediene/anthropos into javabackend

Conflicts:
	.idea/artifacts/MedlemsDatabase_war_exploded.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_12.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_12.xml
	.idea/workspace.xml
removing .idea
removing .idea
removed .idea
removed pom and .iml
Merge pull request #7 from aydex/javabackend

Javabackend
Merge pull request #8 from Studentmediene/javabackend

Javabackend