Test
Merge branch 'master' of https://github.com/Undeadkillz/Appetizers.git

Conflicts:
	src/kz/pvp/quadraricassistant/MainActivity.java