fruncis changes oh yeah last 3 bitch uploads
Merge branch 'master' of https://github.com/Zarconium/crisp