Pre merge Commit
Merge branch 'master' of https://github.com/andyryan/jonnyonthespot