fixed ignore
Merge branch 'master' of github.com:chrisjenx/ScrollViewPager

Conflicts:
	.gitignore