return int instead of string
Merge branch 'master' of heroku.com:aiw3-api