More accurately match prototype
Merge branch 'master' of github.com:BuddyApp/frontend