merge michelle's bugfix-- angular waits for data from API before rendering.