ios 10-1
Merge branch 'master' of https://github.com/serv/learning

Conflicts:
	ios/Homepwner/Homepwner/BNRAppDelegate.m