ssh test
grape swagger integrated
Merge remote-tracking branch 'upstream/master'
token authentication returns a token
helper conflict