gulp resize now converts to jpeg, added white circle border to people picture
Merge branch 'feature'