Conflict nog meer oplossen
Merge branch 'master' of
https://github.com/virtualvikings/battleofbots.git

Conflicts:
	client/gen/android/support/v7/appcompat/R.java
	client/gen/com/virtualvikings/battleofthebots/R.java