Initial commit
Merge remote-tracking branch 'iphone6resava/master'

Conflicts:
	.gitignore