refactored fire_query to abstract generator
fixed error in migration where local variable was not passed to extracted method
code styling
fixed merge conflict
changed travis yml
Merge branch 'master' of github.com:secretBears/QAPI

merged master
added get random place function
Merge branch 'dev'

merged dev
commented tests just to see if we can deploy to heroku
fixed rubocop
added get location without function
fixed rubocop issues
removed debug output from place_test