Jerk Story update
Merge branch 'master' of github.com:JulClt/jerkstory