Revert

Code reverted from last upload
Merge branch 'master' of https://github.com/CookieMaster/CookieMasterFlashLight

Conflicts:
	.idea/misc.xml