I HATE BINS AND ALL CONTAINERS OF ALL SORTS!!!!
Merge branch 'master' of https://github.com/robeat101/snarki

Conflicts:
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity$1.class
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity$2.class
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity$3.class
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity$4.class
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity$5.class
	Snarki/bin/classes/com/Snarki/snarki/FullscreenActivity.class
	Snarki/bin/classes/com/Snarki/snarki/R$id.class
	Snarki/bin/classes/com/Snarki/snarki/R$layout.class
	Snarki/bin/classes/com/Snarki/snarki/R$string.class
	Snarki/bin/classes/com/Snarki/snarki/R$style.class
	Snarki/bin/classes/com/Snarki/snarki/R$styleable.class
	Snarki/bin/classes/com/Snarki/snarki/SecondScreen.class