Added everything
Merge branch 'master' of https://github.com/Acour83/ashflashtheorig