Second Commit
Merge https://github.com/alexschultz/Identify

Conflicts:
	.gitignore