Merge branch 'master' of
https://github.com/jnysteen/FoersteAarsProjekt-V3.git

Conflicts:
	HandIns/foerste/AdressParser.java
Merge branch 'master' of https://github.com/jnysteen/FoersteAarsProjekt-V3.git