Merge branch 'master' of /home/Avi/Documents/nowcado-frontend with conflicts.
Merge remote branch 'origin/master'
Point to our backend
Point to our backend
Point to our backend