test multiple commits and pushes to gitHub
Merge branch 'master' of https://github.com/djohnson67/Flashlight

Conflicts:
	Flashlight/ViewController.h