euuhm geen idee
Merge branch 'master' of https://github.com/se2-1213/coyote

mja kweet nie wa schrijven
Conflicts:
	roadrunner/bin/classes/com/project/roadrunner/RoadRunnerApplication.class
Merge branch 'master' of https://github.com/se2-1213/coyote

Conflicts:
	roadrunner/bin/classes.dex
	roadrunner/bin/classes/com/project/roadrunner/RoadRunnerApplication.class
	roadrunner/bin/classes/com/project/roadrunner/constants/ServerConstants.class
	roadrunner/bin/classes/com/project/roadrunner/revision/Profile.class
	roadrunner/bin/roadrunner.apk
-i have finished the methods that manipulate the xml strings
Merge branch 'master' of https://github.com/se2-1213/coyote

mijn functies zijn af

Conflicts:
	roadrunner/bin/classes.dex
	roadrunner/bin/roadrunner.apk