Don't store secret keys in version control
Merge branch 'master' of https://github.com/andyryan/jonnyonthespot

Conflicts:
	.gitignore