Actually back from vaction, new approach to sim
Merge branch 'master' of https://github.com/merdey/Daily-Git