- gitignore file changed
Merge branch 'master' of https://github.com/agwntr/iOS-WebView-Boilerplate

Conflicts:
	Sample App/Sample App/index.html