apologies for shit code
Merge branch 'master' of github.com:wangandrewd/riptest