Claiming as part of state machine
Merge branch 'master' of github.com:appacademy/GetHelp
Merge branch 'master' into frontend_design