changed from restList to list
Merge branch 'master' of https://github.com/JakeRawr/wom_backend
add more data
retry merging
more tests
clean up code