git ignore
Merge branch 'master' of https://github.com/jycr753/IntentCore

Conflicts:
	.gitignore