stuff
Merge branch 'master' of https://github.com/neilbaylorrulez/devangelism
syncing my latest with will
resolved merge