dupa
Merge branch 'master' of https://github.com/McDonald072/Placeholder

Conflicts:
	Project Android/Project Android.int

durr