More merging...

user.go

@@ -37,16 +37,3 @@ func (u *User) AvatarURL(size string) string {
 
 	return URL + "?size=" + size
 }
-
-// AvatarURL returns a URL to the user's avatar.
-//		size:     The size of the user's avatar as a power of two
-func (u *User) AvatarURL(size string) string {
-	var URL string
-	if strings.HasPrefix(u.Avatar, "a_") {
-		URL = EndpointUserAvatarAnimated(u.ID, u.Avatar)
-	} else {
-		URL = EndpointUserAvatar(u.ID, u.Avatar)
-	}
-
-	return URL + "?size=" + size
-}