Working on master
Merge branch 'master' of github.com:ManuelOverdijk/ncc

Conflicts:
	master/app/src/main/java/nl/uva/ncc/SlavesActivity.java