I don't think I changed anything, but I'm trying to pull
Merge branch 'master' of https://github.com/ChristianHansen/sae-build18-2014

Conflicts:
	Setster/bin/Setster.apk
	Setster/bin/classes.dex
	Setster/bin/resources.ap_
Tried editing classpath and project to prevent problems

Paths now relative instead of absolute