Added my other email
Merge branch 'master' of github.com:matthewbentley/indix

Conflicts:
	LICENSE