Adding timeout so server can update image before front end fetches it
Merge branch 'register' into testing