sliders, buttons en defaults
Merge branch 'master' of https://github.com/thijsdaniels89/EvilHangmanGit

Conflicts:
	EvilHangman/bin/classes/com/example/evilhangman/EvilHangman.class
	EvilHangman/bin/classes/com/example/evilhangman/R$array.class
	EvilHangman/bin/classes/com/example/evilhangman/R$attr.class
	EvilHangman/bin/classes/com/example/evilhangman/R$drawable.class
	EvilHangman/bin/classes/com/example/evilhangman/R$id.class
	EvilHangman/bin/classes/com/example/evilhangman/R$layout.class
	EvilHangman/bin/classes/com/example/evilhangman/R$menu.class
	EvilHangman/bin/classes/com/example/evilhangman/R$raw.class
	EvilHangman/bin/classes/com/example/evilhangman/R$string.class
	EvilHangman/bin/classes/com/example/evilhangman/R$style.class
	EvilHangman/gen/com/example/evilhangman/R.java
	EvilHangman/res/raw/words.txt
	EvilHangman/src/com/example/evilhangman/EvilHangman.java