Update
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/resources.ap_
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes/.gitignore
	Pineapple/bin/resources.ap_